|
|
@@ -1,13 +1,8 @@
|
|
|
const dev = {
|
|
|
<<<<<<< HEAD
|
|
|
baseUrl: 'https://www.zthymaoyi.com',
|
|
|
- baseUrlNew: 'http://api.eliangeyun.com',
|
|
|
- // baseUrlNew: 'http://api.eliangeyun.com/',
|
|
|
-=======
|
|
|
- // baseUrl: 'https://www.zthymaoyi.com',
|
|
|
baseUrlNew: 'http://192.168.1.110:8090/',
|
|
|
//baseUrlNew: 'http://api.eliangeyun.com/',
|
|
|
->>>>>>> d303f3c786c9dc54ee027e83252cfac212a2d7e5
|
|
|
h5Appid: 'wxb66b599f7f61b46f',
|
|
|
debug: false
|
|
|
}
|
