Merge branch 'master' of ssh://ops.weface.com.cn:8022/zhangdishen/xichonght

xichongSys/src/router/index.js

@@ -22,13 +22,7 @@ import drdysq from "@/views/Myvue/drdysq";
 import dryhkbg from "@/views/Myvue/dryhkbg";
 import drdcbg from "@/views/Myvue/drdcbg";
 import receivePersonnel from "@/views/Myvue/receivePersonnel";
-<<<<<<< HEAD
-=======
-import AllbaseInfo from "@/views/Myvue/allbaseInfo"
-
->>>>>>> 6e085040c6adbe6dc0a7683960fc22c88928ce3b
 Vue.use(Router)
-
 const router = new Router({
   routes: [
     {

xichongSys/src/utils/global.js

@@ -6,13 +6,8 @@
 
 // 后台管理系统服务器地址
 //export const baseUrl = 'http://172.16.10.33:9002'
-<<<<<<< HEAD
 //export const baseUrl = 'http://172.16.10.25:9002'
 export const baseUrl ="http://172.16.10.33:9002"
-=======
-export const baseUrl = 'http://172.16.10.33:9002'
-//export const baseUrl2 ="http://172.16.10.33:9002"
->>>>>>> 6e085040c6adbe6dc0a7683960fc22c88928ce3b
 export const baseUrl2 = 'http://172.16.10.25:9999'
 // 系统数据备份还原服务器地址
 //export const backupBaseUrl = 'http://localhost:8002'