From db1c4a8dd11613ab14606bcf64504fd1662d1031 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 28 十月 2024 15:07:55 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/src/main.js b/src/main.js
index fc53eef..fc67442 100644
--- a/src/main.js
+++ b/src/main.js
@@ -25,11 +25,7 @@
 
 // //閫氫俊娴嬭瘯搴�
 // Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-const javaApi = 'http://10.1.13.77:8001';
-
-// //閫氫俊姝ｅ紡搴�
-// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
-// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+// const javaApi = 'http://10.1.13.77:8001';
 
 // 閫氫俊姝ｅ紡搴�
 Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";

--
Gitblit v1.9.3