From 9dc32795c75ee417f45ef3b5b42a005ada0411bf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 10 四月 2026 12:55:17 +0800
Subject: [PATCH] 合并分支

---
 WebTM/layuiadmin/Scripts/webConfig.js |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 31d5e53..212369d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,11 +3,7 @@
   //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
   //var WEBURL = "http://localhost/API/";             //棰滄檽鍐涙湰鍦伴厤缃�
   //var WEBURL = "http://localhost:8082/API/";        //鏉滆春鏈湴閰嶇疆
-<<<<<<< HEAD
-  var WEBURL = "http://localhost:81/API/"           //缈佹稕娑涙湰鍦伴厤缃�
-  //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
-=======
-  //var WEBURL = "http://localhost:81/API/"           //缈佹稕娑涙湰鍦伴厤缃�
+  // var WEBURL = "http://localhost:81/API/"           //缈佹稕娑涙湰鍦伴厤缃�
   // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
 >>>>>>> e389db19bb5626403e880d3d93b2e1b205b86280
   // var WEBURL = "http://localhost:81/API/";          //闄堥晲鍝叉湰鍦伴厤缃�
@@ -34,7 +30,7 @@
   //var WEBURL = "http://121.36.199.126:8181/API/";   //涓夊崌
   //var WEBURL = "http://36.134.2.30:200/WEBS-API/";  //閲戝竻
   //var WEBURL = "http://172.16.1.85/API/";           //杩﹀崡
-  // var WEBURL = "http://61.164.64.222:8082/API_WW/"
+  var WEBURL = "http://61.164.64.222:8082/API_WW/"
   return WEBURL;
 }
 

--
Gitblit v1.9.1