From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/common/Menu.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index 04c3ed2..e4414db 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="menu" :class="{collapse: menuData.collapse}">
     <div class="logo">
-<!--      <div><img src="@/assets/logo.png"></div>-->
+      <div><img src="@/assets/logo.png"></div>
       <h1 :class="{hidden: menuData.collapse}">鑱斿悎鍒╁崕浜嬩欢涓婃姤绯荤粺</h1>
     </div>
     <scrollbar>

--
Gitblit v1.9.3