Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

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

@@ -884,7 +884,7 @@ public class StoreApiServiceImpl implements StoreApiService {
                         }
                         jsonObject.put(existObj.toString(), value == null ? 0l : Long.valueOf(value));
                     } else {
-                        jsonObject.put(existObj.toString(), extendDTO.getValue() == null ? 0 : Long.valueOf(extendDTO.getValue()));
+                        jsonObject.put(existObj.toString(), StringUtils.isBlank(extendDTO.getValue()) ? 0 : Long.valueOf(extendDTO.getValue()));
                     }
                 }
             }

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -323,7 +323,7 @@ public class StoreImportController {
         if (validate) {
             // 验证门店code唯一
             if (storeImportApiService.validateStoreName(enterpriseId, storeName).getResult()) {
-                bean.setErrorMessage("门店名字重复");
+                bean.setErrorMessage("门店名称已经存在");
                 validate = false;
             }
         }

gic-store-web/src/main/java/com/gic/store/web/qo/region/StoreRegionQO.java

@@ -14,7 +14,6 @@ public class StoreRegionQO implements Serializable {
     public interface SaveValidView{}
 
     private Integer regionId;
-    @NotNull(message = "门店域code不能为空", groups = {SaveValidView.class})
     private String regionCode;
     @NotNull(message = "门店域名称不能为空", groups = {SaveValidView.class})
     private String regionName;