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

guoshilong

2024-01-25 c689f2d200bd884546aac8b87d33cbe53f03b5ba

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java

@@ -30,7 +30,7 @@
   IPatrolGroupItemService patrolGroupItemService;

   @Override
   public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord) {
   public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecordVO patrolRecord) {
      return page.setRecords(baseMapper.selectPatrolRecord(page,patrolRecord));
   }