From 4936ba718f4ec2d069a9c28d07215573ed8548aa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 10:12:10 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug

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

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

--
Gitblit v1.9.3