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

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -503,7 +503,7 @@ public class StoreApiServiceImpl implements StoreApiService {
 
     private String validBrandIsExist(String brandIds) {
         if (StringUtils.isBlank(brandIds)) {
-            return null;
+            return "请填写店招品牌";
         }
         List<TabStoreBrand> storeBrandList = storeBrandService.listStoreBrandByIds(brandIds);
         if (CollectionUtils.isEmpty(storeBrandList) || brandIds.split(GlobalInfo.FLAG_COMMA).length > storeBrandList.size()) {