Merge remote-tracking branch 'origin/master' into master

licp

2024-12-26 943f66294cae53cb1617b237ec992691e01f516b

Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	src/components/view/index-index.vue

 src/components/view/index-index.vue

@@ -314,7 +314,7 @@
        </div>
      </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 card">
          <div class="right-1-item" @click="openNotice">
            <div class="img">
              <img src="../../../static/img/index-0.svg" alt="">