Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/report/query/QueryReportPageListService.java

@@ -162,13 +162,7 @@ public class QueryReportPageListService {
      * @return
      */
     private List<ReportPageListVo> buildReportPageListVoList(List<Report> reportList) {
-        //List<ReportPageListVo> reportPageListVoList = ReportConverMapper.INSTANCE.fromReportListToReportPageListList(reportList);
-        List<ReportPageListVo> reportPageListVoList = new ArrayList<>();
-        ReportPageListVo vo = new ReportPageListVo();
-        for (Report report : reportList) {
-            BeanUtils.copyProperties(report,vo);
-            reportPageListVoList.add(vo);
-        }
+        List<ReportPageListVo> reportPageListVoList = ReportConverMapper.INSTANCE.fromReportListToReportPageListList(reportList);
         for (ReportPageListVo reportPageListVo : reportPageListVoList) {
             List<InspectionFile> inspectionFileList = inspectionFileMapper.selectList(Wrappers.<InspectionFile>lambdaQuery()
                     .eq(InspectionFile::getInspectionId, reportPageListVo.getInspectionId())