Commit dfaa133006cac7512572f0b98a7f0c40f3230b17

Authored by 杨鑫
1 parent de91fb0d

最新

admin-web-master/src/utils/request.js
@@ -22,11 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost @@ -22,11 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 22 // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
23 23
24 24
25 -<<<<<<< HEAD  
26 - baseURL = 'http://128.10.249.26:9003';  
27 -=======  
28 // baseURL = 'http://128.10.249.23:9003'; 25 // baseURL = 'http://128.10.249.23:9003';
29 ->>>>>>> 2727043f776460ef29f119ecf30a65f746104338  
30 26
31 27
32 } else { 28 } else {