From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +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 cbc3174..018e938 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,7 +14,7 @@
 //鏈湴
 Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 const javaApi = 'http://192.168.0.24:8001';//鏉�
-// const javaApi = 'http://114.132.189.42:9006';//鏉�
+// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
 //鑳滀簯鏈嶅姟鍣�
 // Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
 // const javaApi = 'http://122.114.52.69:8001';

--
Gitblit v1.9.3