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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java

@@ -96,13 +96,13 @@ public class IcBulidingFormDTO implements Serializable {
     /**
      * 总楼层总数
      */
-    @NotNull(message = "总楼层总数不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
+    //@NotNull(message = "总楼层总数不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer totalFloorNum;
 
     /**
      * 总户数
      */
-    @NotNull(message = "总户数不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
+    //@NotNull(message = "总户数不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer totalHouseNum;
     /**
      * 坐标位置

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodFormDTO.java

@@ -66,7 +66,7 @@ public class IcNeighborHoodFormDTO implements Serializable {
     /**
      * 关联物业id
      */
-    @NotBlank(message = "关联物业ID不能为空", groups = {AddShowGroup.class,UpdateShowGroup.class})
+    //@NotBlank(message = "关联物业ID不能为空", groups = {AddShowGroup.class,UpdateShowGroup.class})
     private String propertyId;
 
     /**