From a16d0d40755d4da86242ef12472aed2d1a8b2ffb Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 17 十二月 2025 13:11:29 +0800
Subject: [PATCH] 1

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

diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index c39b462..d77cc5e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,12 +7,18 @@
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
    /*  var WEBURL = "http://localhost:8082/API/";    //鏉滆春鏈湴閰嶇疆*/
     //var WEBURL = "http://localhost:8082/API/";    //寮犵憺骞挎湰鍦伴厤缃�
+<<<<<<< HEAD
 
     var WEBURL = "http://localhost:8080/API/";    //鐜嬩华鏈湴閰嶇疆
     //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
 
 /*    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�*/
 
+=======
+    var WEBURL = "http://localhost:8080/API/";    //鐜嬩华鏈湴閰嶇疆
+    //var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+    var WEBURL = "http://localhost:81/API/"    //缈佹稕娑涙湰鍦伴厤缃�
+>>>>>>> a12e0abce941275b1d4295790546c673e556cd89
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //鏉ㄤ箰鏈湴閰嶇疆
     //var WEBURL = "http://47.96.97.237/API/";          //鏅轰簯鏈嶅姟鍣�
     /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //浣欐�濇澃鏈湴閰嶇疆

--
Gitblit v1.9.1