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

gic-platform-operation-web/src/main/java/com/gic/operation/web/qo/PlatformBrandQO.java

@@ -14,7 +14,7 @@ public class PlatformBrandQO implements Serializable {
     private Integer platformBrandId;
     @NotNull(message = "品牌名不能为空", groups = {SavePlatformBrandValid.class})
     private String platformBrandName;
-    @NotNull(message = "经营类目不能为空", groups = {SavePlatformBrandValid.class})
+//    @NotNull(message = "经营类目不能为空", groups = {SavePlatformBrandValid.class})
     private String platformBrandCategoryCode;
 
     private Integer createType;