From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +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 e59dcaf..856d2ce 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,9 +20,9 @@
 Vue.prototype.PROJECT = "妫�娴嬩腑蹇�";
 // 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";
+Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+const javaApi = "http://127.0.0.1:8001";
+// const javaApi = "http://192.168.0.170:8001";
 
 //閫氫俊娴嬭瘯搴�
 // Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
@@ -30,8 +30,8 @@
 
 // 閫氫俊姝ｅ紡搴�
 // Vue.prototype.LOCATIONVUE = "http://192.168.22.29:8080";
-// const javaApi = 'http://192.168.22.29:8001/lims/';
 // const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+// const javaApi = 'http://192.168.22.29:8001/lims/';
 
 // //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";

--
Gitblit v1.9.3