1

config/index.js

@@ -1,12 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
-<<<<<<< HEAD
-	baseUrlNew: 'http://api1.eliangeyun.com/',
-=======
 	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
->>>>>>> 56c157c68012d2125a3c26a99453f22c95cf7765
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }