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 | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main.js b/src/main.js
index 9932823..4293cee 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,8 +15,8 @@
Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
// Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
-// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://127.0.0.1:8001';
+Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+const javaApi = 'http://127.0.0.1:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -27,8 +27,8 @@
// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
-Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-const javaApi = 'http://10.16.173.59:8001';
+// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
+// const javaApi = 'http://10.16.173.59:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
--
Gitblit v1.9.3