修改冲突

licp

2024-12-26 b7eedb41516a6ab02526e64177331a9669f4d3cb

 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="">