From f32444bd4f75beefe9b4f50073b293f4f3738c3f Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 22 七月 2026 10:41:35 +0800
Subject: [PATCH] fix: 合并
---
multiple/config.json | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/multiple/config.json b/multiple/config.json
index e16851c..936cb5c 100644
--- a/multiple/config.json
+++ b/multiple/config.json
@@ -132,6 +132,24 @@
"logo": "logo/HYLQLogo.png",
"favicon": "favicon/HYLQfavicon.ico"
},
+ "HJGC": {
+ "env": {
+ "VITE_APP_TITLE": "鐜宸ョ▼绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://36.139.202.111:9014",
+ "VITE_JAVA_API": "http://36.139.202.111:9013"
+ },
+ "logo": "logo/HJGCLogo.png",
+ "favicon": "favicon/HJGCfavicon.ico"
+ },
+ "QYHY": {
+ "env": {
+ "VITE_APP_TITLE": "濂囩紭鎭掕壓绠＄悊绯荤粺",
+ "VITE_BASE_API": "http://36.139.202.111:9012",
+ "VITE_JAVA_API": "http://36.139.202.111:9011"
+ },
+ "logo": "logo/QYHYLogo.png",
+ "favicon": "favicon/QYHYfavicon.ico"
+ },
"QXY": {
"env": {
"VITE_APP_TITLE": "寮轰俊瀹囩數鍣ㄤ簯涓绘満",
@@ -323,6 +341,7 @@
"logo": "logo/QLMCLogo.png",
"favicon": "favicon/QLMCico.ico"
},
+<<<<<<< HEAD
"HYZC": {
"env": {
"VITE_APP_TITLE": "灞辫タ鍗庝嚎浼楁垚寤烘潗鏈夐檺鍏徃",
@@ -331,6 +350,16 @@
},
"logo": "logo/HYZCLogo.png",
"favicon": "favicon/HYZCfavicon.ico"
+=======
+ "OLD": {
+ "env": {
+ "VITE_APP_TITLE": "闈掓捣娆ц幈寰锋柊鏉愭枡绉戞妧鏈夐檺鍏徃",
+ "VITE_BASE_API": "http://223.221.37.139:9000",
+ "VITE_JAVA_API": "http://223.221.37.139:9000"
+ },
+ "logo": "logo/OLDLogo.png",
+ "favicon": "favicon/OLD.ico"
+>>>>>>> 2339ff7769b82ec68cc09ec70a9e61f70b0119dd
},
"logo": "/src/assets/logo/logo.png",
"favicon": "/public/favicon.ico"
--
Gitblit v1.9.3