From 2f35b37455acd46c50658a3c56e45db03eaa480a Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 15 五月 2024 10:54:23 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/main.js b/src/main.js
index f149db9..a904d00 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,10 +14,10 @@
 //鏈湴
 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://10.20.102.168:8001';//寮�
 // const javaApi = 'http://172.20.10.3:8001';//濮�
 // const javaApi = 'http://192.168.11.2:8001';//鏌�
-// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
+const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
 //鑳滀簯鏈嶅姟鍣�
 // Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
 // const javaApi = 'http://122.114.52.69:8001';

--
Gitblit v1.9.3