From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突

---
 src/components/view/index-index.vue |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 7c824e6..a5075c7 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -315,8 +315,6 @@
       </el-col>
       <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
         <div class="right-1 card" v-if="getNumberFourTypes">
-          <div class="right-1-item">
-        <div class="right-1 card">
           <div class="right-1-item" @click="openNotice">
             <div class="img">
               <img src="../../../static/img/index-0.svg" alt="">

--
Gitblit v1.9.3