Merge branch 'dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AblityListFormDTO.java

@@ -21,12 +21,12 @@ public class AblityListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     public interface AddUserInternalGroup {}
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthAblityListFormDTO.java

@@ -21,12 +21,12 @@ public class MonthAblityListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     public interface AddUserInternalGroup {}
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthScoreListFormDTO.java

@@ -17,7 +17,7 @@ public class MonthScoreListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {MonthScoreListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织Id
@@ -27,7 +27,7 @@ public class MonthScoreListFormDTO implements Serializable {
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {MonthScoreListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     /**
      * 月份Id（格式：202009）

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PeerComparisonFormDTO.java

@@ -22,17 +22,17 @@ public class PeerComparisonFormDTO implements Serializable {
     /**
      * 月份Id（格式：202009）
      */
-    @NotBlank(message = "月份ID不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "月份ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String monthId;
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String orgType;
     public interface AddUserInternalGroup {}
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScoreListFormDTO.java

@@ -17,7 +17,7 @@ public class ScoreListFormDTO implements Serializable {
     /**
      * 组织或网格Id
      */
-    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格ID不能为空",groups = {ScoreListFormDTO.AddUserInternalGroup.class})
     private String orgId;
     /**
      * 组织Id
@@ -27,7 +27,7 @@ public class ScoreListFormDTO implements Serializable {
     /**
      * 组织或网格类型
      */
-    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    @NotBlank(message = "组织或网格类型不能为空",groups = {ScoreListFormDTO.AddUserInternalGroup.class})
     private String orgType;
     /**
      * 月份Id（格式：202009）