From 752e8fd530e3aae8cfa8e86136f51dc50b4b64b6 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 21 四月 2026 20:23:24 +0800
Subject: [PATCH] 1

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

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 31d5e53..6e12757 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -3,13 +3,10 @@
   //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:8080/API/";        //鐜嬩华鏈湴閰嶇疆

--
Gitblit v1.9.1