xcx

config/index.js

@@ -12,13 +12,8 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-<<<<<<< HEAD
-        target: 'http://192.168.0.62:8080', //wf
-        // target: 'http://localhost:8080', 
-=======
         // target: 'http://192.168.0.62:8080', //wf
         target: 'http://localhost:8080', 
->>>>>>> 39e74bdea82b0a3170a0477becad3a119521b6f0
         // target: 'http://192.168.0.11', //ys
         // target: 'http://192.168.0.11', //ys
         // target: 'http://dev.ycjcjy.com/', //frp