From 32d56327d6f69373ada1c3447f542ec1a39282b1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 17:31:01 +0800
Subject: [PATCH] 合并冲突
---
src/main.js | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main.js b/src/main.js
index e06060c..e0e4031 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,13 +17,10 @@
// const javaApi = 'http://192.168.11.249:8001';//寮�
const javaApi = 'http://172.20.10.3:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
-// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
+// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';
-//浜戞湇鍔″櫒
-// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:39901";
-// const javaApi = 'http://114.132.189.42:9006';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
--
Gitblit v1.9.3