From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/view/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/view/index.vue b/src/view/index.vue
index 3716b4c..bf6e4d7 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -394,7 +394,7 @@
</span>
</el-dialog>
<notice ref="notice" @goNoticeDetail="checkForUnreadData()" />
- <timer></timer>
+ <!-- <timer></timer> -->
</div>
</template>
--
Gitblit v1.9.3