From 2a7da14df5ba2c0c3b08182cd2af24a2a23e9942 Mon Sep 17 00:00:00 2001
From: QDKF <QDKF@qq.com>
Date: Tue, 23 Sep 2025 17:29:00 +0800
Subject: [PATCH] =?UTF-8?q?merge:=20=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teacher/message/components/NotificationMessages.vue   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/views/teacher/message/components/NotificationMessages.vue b/src/views/teacher/message/components/NotificationMessages.vue
index ca3c99a..2f15950 100644
--- a/src/views/teacher/message/components/NotificationMessages.vue
+++ b/src/views/teacher/message/components/NotificationMessages.vue
@@ -85,11 +85,7 @@
               <h4 class="chat-user-name">
                 {{ activeContact?.name }}
                 <span v-if="activeContact?.type === 'group'" class="member-count">({{ activeContact?.memberCount || 0
-<<<<<<< HEAD
                 }}人)</span>
-=======
-                  }}人)</span>
->>>>>>> 75fd712a3291f007aa9678c7772ebb1ba4a9e9ba
               </h4>
             </div>
           </div>
@@ -1822,11 +1818,7 @@ onMounted(() => {
 <style scoped>
 .chat-container {
   display: flex;
-<<<<<<< HEAD
-  height: 75vh;
-=======
   height: calc(100vh - var(--top-height, 130px) - 64px - 145px);
->>>>>>> 75fd712a3291f007aa9678c7772ebb1ba4a9e9ba
   background: #fff;
   border-radius: 4px;
   overflow: hidden;