From 56b7f5dd6fda8c39f0b7038a265d507e0d22227c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 24 七月 2024 14:56:35 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/main.js b/src/main.js
index a98546a..1ce1506 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,9 +18,10 @@
 Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
 // Vue.prototype.PROJECT = '瑁呭鐢电紗'
 //鏈湴
-Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 // const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.15.249:8001';
+// 寮狅細192.168.45.249
+const javaApi = 'http://172.20.10.5:8001';
 
 //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";

--
Gitblit v1.9.3