From 4e598bff548c0e4a89f30e1523bdfb8b59d97741 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 30 一月 2026 09:59:05 +0800
Subject: [PATCH] tijiao
---
admin/public/index.html | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/admin/public/index.html b/admin/public/index.html
index 552a722..f8a9b72 100644
--- a/admin/public/index.html
+++ b/admin/public/index.html
@@ -5,11 +5,19 @@
<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">
- <title>鍗庢櫉鍥尯</title>
+<<<<<<< HEAD
+ <title>鏅烘収鍥尯瀹夋秷涓�浣撳寲绯荤粺</title>
</head>
<body>
<noscript>
- <strong>We're sorry but 璞嗙背璺宠烦 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+ <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 -->
--
Gitblit v1.9.3