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

---
 admin/public/index.html |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/admin/public/index.html b/admin/public/index.html
index f8a9b72..1bc9ffd 100644
--- a/admin/public/index.html
+++ b/admin/public/index.html
@@ -5,20 +5,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-<<<<<<< HEAD
     <title>鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺</title>
   </head>
   <body>
     <noscript>
       <strong>We're sorry but 鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-=======
-    <title>鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but 鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
->>>>>>> c5675caa (鏈�鏂扮増鏈�541200007)
-    </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
   </body>

--
Gitblit v1.9.3