|
@@ -1,9 +1,6 @@
|
|
|
window.mapUrl = "http://192.168.1.188:9109/map/?z={z}&x={x}&y={y}"; //地图服务地址
|
|
|
-<<<<<<< HEAD
|
|
|
-window.baseUrl = "http://127.0.0.1:9999/"; //谢建电脑服务地址
|
|
|
-=======
|
|
|
+//window.baseUrl = "http://127.0.0.1:9999/"; //谢建电脑服务地址
|
|
|
window.baseUrl = "http://192.168.3.33:9999/"; //谢建电脑服务地址
|
|
|
->>>>>>> 2483136f1989945649915d477227710a4d331fca
|
|
|
// window.baseUrl = "http://192.168.1.129:1003/"; //景辉电脑服务地址
|
|
|
// window.baseUrl = "http://192.168.1.77:9999/"; //伍汭服务地址
|
|
|
// window.baseUrl = "http://192.168.1.55:9999/"; //博文服务地址
|