Merge branch 'dev_data_fusion' into develop

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyGroupTotalFormDTO.java

@@ -17,7 +17,7 @@ public class AgencyGroupTotalFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
-    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    @NotEmpty(message = "至少有一条数据", groups = {AgencyGroupTotalFormDTO.saveList.class})
     private List<DataList> dataList;
 
     /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyHotTopicFormDTO.java

@@ -17,7 +17,7 @@ public class AgencyHotTopicFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
-    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    @NotEmpty(message = "至少有一条数据", groups = {AgencyHotTopicFormDTO.saveList.class})
     private List<DataList> dataList;
 
     /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyRegUserFormDTO.java

@@ -18,7 +18,7 @@ public class AgencyRegUserFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
-    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    @NotEmpty(message = "至少有一条数据", groups = {AgencyRegUserFormDTO.saveList.class})
     private List<DataList> dataList;
 
     /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridHotTopicFormDTO.java

@@ -17,7 +17,7 @@ public class GridHotTopicFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
-    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    @NotEmpty(message = "至少有一条数据", groups = {GridHotTopicFormDTO.saveList.class})
     private List<DataList> dataList;
 
     /**

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridRegUserFormDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dto.basereport.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.dto.indexcollect.form.GridPartyAbilityFormDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -19,7 +18,7 @@ public class GridRegUserFormDTO implements Serializable {
     /**
      * 数据集合对象
      */
-    @NotEmpty(message = "至少有一条数据", groups = {GridGroupTotalFormDTO.saveList.class})
+    @NotEmpty(message = "至少有一条数据", groups = {GridRegUserFormDTO.saveList.class})
     private List<DataList> dataList;
 
     /**