From 0f56aa60f9d6a779790f5f490cc8d3f3a39cf4aa Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 10:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 admin/src/components/common/CommonHeader.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/common/CommonHeader.vue b/admin/src/components/common/CommonHeader.vue
index 9c4dce0..4428d9a 100644
--- a/admin/src/components/common/CommonHeader.vue
+++ b/admin/src/components/common/CommonHeader.vue
@@ -21,8 +21,8 @@
               </div>
           </div>
           <div class="user-images">
-              <img src="@/assets/icons/ic_1.jpg" alt="">
-              <img src="@/assets/icons/ic_2.png" alt="">
+<!--              <img src="@/assets/icons/ic_1.jpg" alt="">-->
+<!--              <img src="@/assets/icons/ic_2.png" alt="">-->
               <img src="@/assets/icons/ic_3.jpg" alt="">
               <img src="@/assets/icons/ic_4.jpg" alt="">
               <img src="@/assets/icons/ic_5.jpg" alt="">
@@ -351,7 +351,7 @@
       flex-direction: column;
       align-items: center;
       justify-content: flex-start;
-      height: 40px;
+      height: 49px;
       cursor: pointer;
 
       .linellae {

--
Gitblit v1.9.3