From 25d10ee678644a6283454ca486d74a938eeccfd1 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 05 十二月 2024 16:50:45 +0800
Subject: [PATCH] Merge branch 'cnas' into master

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

diff --git a/src/main.js b/src/main.js
index b6fd273..107ecf3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,15 +21,15 @@
 //鏈湴
 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 // const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://172.20.10.5:8001';
+const javaApi = 'http://172.20.10.5:8001';
 
 // //閫氫俊娴嬭瘯搴�
 // Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-const javaApi = 'http://10.1.13.77:8001';
+// const javaApi = 'http://10.1.13.77:8001';
 
 // 閫氫俊姝e紡搴�
-// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
-// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
+const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
 
 //浜�
 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";

--
Gitblit v1.9.3