11

vue.config.js

@@ -141,12 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-<<<<<<< HEAD
         target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.122:9100/',
-=======
-        target: 'http://192.168.1.122:8090/',
->>>>>>> fda6d6a17183b1b8bd85dcbfa90d78b2cdf7412b
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',