From 04d1dd7511d7c4f7253152eb3c3443d09bd7d366 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 05 八月 2024 10:58:24 +0800
Subject: [PATCH] 合并冲突
---
src/main.js | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main.js b/src/main.js
index 71d2cef..ddc5532 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,12 +20,10 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// 寮狅細192.168.45.249
-// const javaApi = 'http://192.168.45.249:8001';
-
+const javaApi = 'http://192.168.92.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
-const javaApi = 'http://114.132.189.42:1234';
+// const javaApi = 'http://114.132.189.42:1234';
// //妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
@@ -34,7 +32,7 @@
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
// const javaApi = 'http://10.16.173.59:8001';
-// const javaApi = 'http://192.168.47.2:8001';
+// const javaApi = 'http://192.168.92.249:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
--
Gitblit v1.9.3