Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/Autobio_UI

CallCenterWeb.UI/Script/Common/huayi.config.js

@@ -2,7 +2,11 @@
     var huayi = {};
 }
 huayi.config = {
+<<<<<<< HEAD
+    callcenter_url: "http://localhost:7456/",//生产环境 前端Web站IP和端口
+=======
     callcenter_url: "http://192.168.4.18:5225/",//生产环境 前端Web站IP和端口
+>>>>>>> 0db71accdd29befa050860a7ba5381c41d885e2f
     socket_ip: "192.168.5.7",//WebSocket通讯ip
     socket_port: "8081",    //WebSocket通讯端口
     menuworktime: 30000,    //菜单工单数量刷新间隔