From 8d7134c8d37e08b1a737a02e6abca807d6220774 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期五, 26 三月 2021 17:33:06 +0800
Subject: [PATCH] 冲突解决
---
WebTM/layuiadmin/Scripts/webConfig.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index d7ad7a9..4019179 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,12 +1,12 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- //var WEBURL = "http://localhost:8085/JFAPI/";
- var WEBURL = "http://localhost:8081/lubaoWebAPI/";//鐜嬫案娉㈡湰鍦伴厤缃�
+ var WEBURL = "http://localhost:8085/JFAPI/";
+ //var WEBURL = "http://localhost:8081/lubaoWebAPI/";//鐜嬫案娉㈡湰鍦伴厤缃�
return WEBURL
}
function GetWEBURL1() {
//var WEBURL = 'http://192.168.16.80:8011/'; //鍔炲叕瀹ゆ湇鍔″櫒
- var WEBURL = 'http://localhost:8085/JFAPI/';
+ var WEBURL = 'http://localhost:9011/WebAPI';
return WEBURL
}
\ No newline at end of file
--
Gitblit v1.9.1