From b482e6081bfe182421be331ab190de1e1307e72f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 20 六月 2024 11:49:48 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/main.js b/src/main.js
index 1325d46..4293cee 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,7 @@
 // Vue.prototype.PROJECT = '瑁呭鐢电紗'
 //鏈湴
 Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.0.104:8001';
+const javaApi = 'http://127.0.0.1:8001';
 
 //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";

--
Gitblit v1.9.3