代码合并

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -752,8 +752,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                     throw new XiaoShiException("未查询到无效应对报告信息");
                 }
                 //装载报告信息，无效对应报告拓展信息到ReportDeDTO并返回
-                BeanUtils.copyProperties(report1, reportDeVO);
                 BeanUtils.copyProperties(invalidReReport, reportDeVO);
+                BeanUtils.copyProperties(report1, reportDeVO);
             } else {
                 BeanUtils.copyProperties(report1, reportDeVO);
             }