Merge branch 'mergeBranch' into testToMerge

src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -6,13 +6,14 @@
           :class="areaBase === '' ? 'act' : ''"
           class="brand-item border-all"
           style="float: left"
-          v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
+
           @click="clickAreaBase('')"
         >
           {{ $t("全部标准") }}
         </li>
         <li
           :class="areaBase === item ? 'act' : ''"
+
           class="brand-item margin-notAll"
           v-for="(item,index) in areaBases"
           :key="item"