Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsProductServiceImpl.java

@@ -99,9 +99,9 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                 if (StringUtils.isEmpty(goodsProductDto.getProdEname())) {
                     throw new RRException("第" + count + "行的商品英文名为空！");
                 }
-                if (StringUtils.isEmpty(goodsProductDto.getProdBrand())) {
-                    throw new RRException("第" + count + "行的品牌为空！");
-                }
+//                if (StringUtils.isEmpty(goodsProductDto.getProdBrand())) {
+//                    throw new RRException("第" + count + "行的品牌为空！");
+//                }
                 if (StringUtils.isEmpty(goodsProductDto.getProdBrandCn()) && StringUtils.isEmpty(goodsProductDto.getProdBrandEn())) {
                     throw new RRException("第" + count + "行的品牌中文或品牌英文必填其中之一！");
                 }