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

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java

@@ -73,7 +73,7 @@ public class ProjectApprovalFormDTO implements Serializable {
     /**
      * 网格ID
      */
-    @NotBlank(message = "网格ID不能为空",groups = {AddGroup.class,ProjectApprovalFormDTO.ApprovalCategory.class})
+    @NotBlank(message = "网格ID不能为空",groups = {AddGroup.class})
     private String gridId;
 
     /**