From 58420e1c44780e408ea62a4a8a275e4e52d108a2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 04 六月 2024 16:29:49 +0800
Subject: [PATCH] 合并s冲突

---
 src/main.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.js b/src/main.js
index 580b072..72b15e5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,11 +13,11 @@
 
 //鏈湴
 Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://192.168.11.200:8001';//鏉�
-// const javaApi = 'http://10.20.102.168:8001';//寮�
+const javaApi = 'http://192.168.11.200:8001';//鏉�
+// const javaApi = 'http://192.168.11.249:8001';//寮�
 // const javaApi = 'http://172.20.10.3:8001';//濮�
 // const javaApi = 'http://192.168.11.2:8001';//鏌�
- const javaApi = 'http://127.0.0.1:8001';//鏅�
+//  const javaApi = 'http://127.0.0.1:8001';//鏅�
 // const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
 //鑳滀簯鏈嶅姟鍣�
 // Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";

--
Gitblit v1.9.3