From 976d776e39ec9bb87076fcfa11273af4729f519e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 四月 2024 15:44:43 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/main.js b/src/main.js
index 018e938..def9d78 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,7 +13,7 @@
 
 //鏈湴
 Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-const javaApi = 'http://192.168.0.24:8001';//鏉�
+const javaApi = 'http://192.168.0.10:8001';//鏉�
 // const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
 //鑳滀簯鏈嶅姟鍣�
 // Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";

--
Gitblit v1.9.3