''

xichongSys/src/utils/global.js

@@ -6,19 +6,20 @@
 
 // 后台管理系统服务器地址
 //export const baseUrl = 'http://172.16.10.33:9002'
-<<<<<<< HEAD
 //export const baseUrl = 'http://172.16.10.25:9009'
 //export const baseUrl ="http://faceauth.weface.com.cn:98"
 //export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
 //export const baseUrl = 'http://172.16.10.33:9002'
 //export const baseUrl = 'http://172.16.10.25:9002'
 export const baseUrl ="http://172.16.10.33:9002"
-export const baseUrl2 = 'http://172.16.10.25:9999'
-=======
-export const baseUrl = 'http://172.16.10.25:9002'
+//export const baseUrl2 = 'http://172.16.10.25:9999'
+//export const baseUrl = 'http://172.16.10.25:9002'
 //export const baseUrl ="http://172.16.10.33:9002"
 export const baseUrl2 = 'http://172.16.10.25:9007'
->>>>>>> 1d7cdaf1ac6c77b2cce06f7ac6a1a8792784dbe7
+//export const baseUrl = 'http://172.16.10.33:9002'
+//export const baseUrl = 'http://172.16.10.25:9009'
+//export const baseUrl ="http://faceauth.weface.com.cn:98"
+//export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
 // 系统数据备份还原服务器地址
 //export const backupBaseUrl = 'http://localhost:8002'
 //export const baseUrl = 'http://faceauth.weface.com.cn:98'