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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilerelectronicreportauditrecord/BoilerElectronicReportAuditRecordMapper.java

@@ -33,7 +33,7 @@ public interface BoilerElectronicReportAuditRecordMapper extends BaseMapperX<Boi
                 .eqIfPresent(BoilerElectronicReportAuditRecordDO::getIssueReportObjectJson, reqVO.getIssueReportObjectJson())
                 .eqIfPresent(BoilerElectronicReportAuditRecordDO::getReportAuditId, reqVO.getReportAuditId())
                 .betweenIfPresent(BoilerElectronicReportAuditRecordDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(BoilerElectronicReportAuditRecordDO::getId));
+                .orderByDesc(BoilerElectronicReportAuditRecordDO::getCreateTime));
     }
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/boilertaskorderissuereport/BoilerTaskOrderIssueReportMapper.java

@@ -47,7 +47,7 @@ public interface BoilerTaskOrderIssueReportMapper extends BaseMapperX<BoilerTask
                 .eqIfPresent(BoilerTaskOrderIssueReportDO::getRecipientMemberUserId, reqVO.getRecipientMemberUserId())
                 .eqIfPresent(BoilerTaskOrderIssueReportDO::getOrderItemReportId, reqVO.getOrderItemReportId())
                 .eqIfPresent(BoilerTaskOrderIssueReportDO::getBusinessType, reqVO.getBusinessType())
-                .orderByDesc(BoilerTaskOrderIssueReportDO::getId));
+                .orderByDesc(BoilerTaskOrderIssueReportDO::getCreateTime));
     }
 
     default List<BoilerTaskOrderItemDetailVO> selectPageJoin(String id) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipeelectronicreportauditrecord/PipeElectronicReportAuditRecordMapper.java

@@ -33,7 +33,7 @@ public interface PipeElectronicReportAuditRecordMapper extends BaseMapperX<PipeE
                 .eqIfPresent(PipeElectronicReportAuditRecordDO::getIssueReportObjectJson, reqVO.getIssueReportObjectJson())
                 .eqIfPresent(PipeElectronicReportAuditRecordDO::getReportAuditId, reqVO.getReportAuditId())
                 .betweenIfPresent(PipeElectronicReportAuditRecordDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(PipeElectronicReportAuditRecordDO::getId));
+                .orderByDesc(PipeElectronicReportAuditRecordDO::getCreateTime));
     }
 
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/pipetaskorderissuereport/PipeTaskOrderIssueReportMapper.java

@@ -52,7 +52,7 @@ public interface PipeTaskOrderIssueReportMapper extends BaseMapperX<PipeTaskOrde
                 .eqIfPresent(PipeTaskOrderIssueReportDO::getRecipientMemberUserId, reqVO.getRecipientMemberUserId())
                 .eqIfPresent(PipeTaskOrderIssueReportDO::getOrderItemReportId, reqVO.getOrderItemReportId())
                 .eqIfPresent(PipeTaskOrderIssueReportDO::getBusinessType, reqVO.getBusinessType())
-                .orderByDesc(PipeTaskOrderIssueReportDO::getId));
+                .orderByDesc(PipeTaskOrderIssueReportDO::getCreateTime));
     }
 
     default List<PipeTaskOrderItemDetailVO> selectPageJoin(String id) {