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

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresSpecsSkuServiceImpl.java

@@ -189,6 +189,9 @@ public class BdWaresSpecsSkuServiceImpl extends ServiceImpl<BdWaresSpecsSkuMappe
     @Override
     public CuWaresParams queryWaresSpecsSkuCount(Integer specialArea, String waresCode, Long loginMemberId, Integer pkCountry) {
         List<BdWaresSpecsSkuExt> bdWaresSpecsSkuExtList;
+        if(ObjectUtil.isEmpty(specialArea)){
+            specialArea = -1;
+        }
         if(ESpecialArea.RETAIL_UPGRADE.getValue() == specialArea){
             specialArea = ESpecialArea.RETAIL_REGISTER.getValue();
         }