Merge branch 'feature/act-code' into dev

src/components/common/selectShop.vue

@@ -4,7 +4,7 @@
       <div slot-scope="{ option }">
         <p>{{ option.storeName }}</p>
         <p style="font-size: 12px;line-height: 18px">{{ option.storeCode }}</p>
-        <p v-show="option.isOver == 0" class="isOver">所有导购今日添加已到上限</p>
+        <p v-show="option.isOver == 1" class="isOver">所有导购今日添加已到上限</p>
       </div>
     </dm-simple-transfer>
     <div class="show-select-num cursor-pointer w-250" slot="reference">