From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突

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

diff --git a/src/main.js b/src/main.js
index 5ca9a36..70f1d88 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,8 +25,8 @@
 // const javaApi = 'http://172.20.10.5:8001';
 
 //閫氫俊娴嬭瘯搴�
-Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-const javaApi = 'http://10.1.13.77:8001';
+// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
+// const javaApi = 'http://10.1.13.77:8001';
 
 // 閫氫俊姝ｅ紡搴�
 Vue.prototype.LOCATIONVUE = "http://10.193.45.63:8080";

--
Gitblit v1.9.3