From 4e598bff548c0e4a89f30e1523bdfb8b59d97741 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 09:59:05 +0800
Subject: [PATCH] tijiao

---
 admin/.env |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/admin/.env b/admin/.env
index 788b741..28ed2e0 100644
--- a/admin/.env
+++ b/admin/.env
@@ -10,4 +10,8 @@
 VUE_APP_API_PREFIX = '/system_gateway'
 
 # 椤圭洰鍚嶇О
+<<<<<<< HEAD
 VUE_APP_TITLE = '鏅烘収鐗╂祦鍥尯瀹夋秷涓�浣撳寲绯荤粺'
+=======
+VUE_APP_TITLE = '鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺'
+>>>>>>> c5675caa (鏈�鏂扮増鏈�541200007)

--
Gitblit v1.9.3