Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	vue.config.js

vue.config.js

@@ -142,9 +142,6 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         target: 'http://192.168.1.122:9100/',
-        // target: 'http://192.168.1.115:8090/',
-        // target: 'http://192.168.1.107/:8090/',
-        // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',