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

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/CustomerDataManageResultDTO.java

@@ -13,7 +13,7 @@ import java.util.List;
 @Data
 public class CustomerDataManageResultDTO {
 
-    List<CustomerDataManage> dataManageList = new ArrayList<>();
+    List<CustomerDataManage> list = new ArrayList<>();
     private Integer total;
 
     @Data

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -1856,7 +1856,7 @@ public class DataStatsServiceImpl implements DataStatsService {
      */
     @Override
     public void CustomerDataManage(CustomerDataManageFormDTO formDTO, HttpServletResponse response) throws Exception {
-        List<CustomerDataManageResultDTO.CustomerDataManage> result = operateExport(formDTO).getDataManageList();
+        List<CustomerDataManageResultDTO.CustomerDataManage> result = operateExport(formDTO).getList();
         if (!CollectionUtils.isEmpty(result)){
             CustomerDataManageResultDTO.CustomerDataManage c = new CustomerDataManageResultDTO.CustomerDataManage();
             c.setOrgName("合计");
@@ -2111,10 +2111,10 @@ public class DataStatsServiceImpl implements DataStatsService {
             int firstIndex = (formDTO.getPageNo() - 1) * formDTO.getPageSize();
             int lastIndex = formDTO.getPageNo() * formDTO.getPageSize();
             List<CustomerDataManageResultDTO.CustomerDataManage> list = dataManageList.subList((firstIndex > dataManageList.size() ? dataManageList.size() : firstIndex), (lastIndex > dataManageList.size() ? dataManageList.size() : lastIndex));
-            resultDTO.setDataManageList(list);
+            resultDTO.setList(list);
             return resultDTO;
         }
-        resultDTO.setDataManageList(dataManageList);
+        resultDTO.setList(dataManageList);
         return resultDTO;
     }