From 2ec28b5d41f5f4961d1cd4cca6d94002604a3aae Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 16 四月 2026 17:02:02 +0800
Subject: [PATCH] 1

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

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 31d5e53..27cf27b 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,15 +3,12 @@
   //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:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
->>>>>>> e389db19bb5626403e880d3d93b2e1b205b86280
-  // var WEBURL = "http://localhost:81/API/";          //闄堥晲鍝叉湰鍦伴厤缃�
-  //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //鏉庢灄淇婃湰鍦伴厤缃�
+  //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+  var WEBURL = "http://localhost:81/API/";          //闄堥晲鍝叉湰鍦伴厤缃�
+  // var WEBURL = "http://localhost:8082/LuBaoAPI/";   //鏉庢灄淇婃湰鍦伴厤缃�
   //var WEBURL = "http://localhost:8080/API/";        //鐜嬩华鏈湴閰嶇疆
   //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //浣欐�濇澃鏈湴閰嶇疆
   //var WEBURL = "http://localhost:8088/ARAPI/";      //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)

--
Gitblit v1.9.1