From 332125c247b8cec21af77479f07ef35558eb6bba Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 02 八月 2024 17:24:09 +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 e0c50da..9e816aa 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@
 //鏈湴
 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 // const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://172.20.10.5:8001';
+const javaApi = 'http://172.20.10.4:8001';
 
 //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";

--
Gitblit v1.9.3