debug

vue.config.js

@@ -5,11 +5,7 @@ module.exports = {
         proxy: {
             "/data": {
                 target: "http://60.205.177.43",
-<<<<<<< HEAD
                 // target: "http://10.199.143.126",
-=======
-                //target: "http://10.199.143.126",
->>>>>>> f3d5fe06374f0679ac94d76774555f439baa7fb1
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,