Merge branch 'dev/v1.0.53_yf' of jianyu/web into feature/v1.0.53

apps/bigmember_pc/src/views/subscribe/SubPush.vue

@@ -55,18 +55,8 @@
           @onChange="changeTime"
           selectorType="line"
         >
-<<<<<<< HEAD
           <div class="filter-label" slot="header">
             选择时间：<span
-=======
-          <div
-            class="filter-label"
-            :class="{ 'label-width': showVipTag }"
-            slot="header"
-          >
-            选择时间：
-            <span
->>>>>>> main
               class="el-icon-jy-vip visibility-hidden"
               v-if="showVipTag"
             ></span>