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 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 8f87e64..212369d 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,6 +5,7 @@
   //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:8080/API/";        //鐜嬩华鏈湴閰嶇疆

--
Gitblit v1.9.1