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

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

@@ -230,6 +230,10 @@ public class BrandServiceImpl implements BrandService {
 
                 // 如果是0就添加数据
                 if (brandId.intValue() == 0) {
+                    BrandEntity queryBrandEntity = brandDao.queryByCategoryIdAndBrandNameAndMerchSn(categoryId, brandEntity.getName(), merchSn);
+                    if (Objects.nonNull(queryBrandEntity)){
+                        throw new ServiceException("第" + (i + 1) + "行的该品牌：【" + queryBrandEntity.getName() + "】已存在！");
+                    }
                     BrandEntity insertBrandEntity = new BrandEntity();
                     insertBrandEntity.setName(brandEntity.getName());
                     insertBrandEntity.setSimpleDesc(brandEntity.getSimpleDesc());