Merge branch 'blueBranch' into allTestUrgent

src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -13,7 +13,6 @@
         </li>
         <li
           :class="areaBase === item ? 'act' : ''"
-          v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
           v-for="(item,index) in areaBases"
           :key="item"