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/controller/PatrolRecordController.java

@@ -39,7 +39,7 @@
    */
   @ApiOperation(value="巡查记录-分页列表查询", notes="巡查记录-分页列表查询")
   @GetMapping(value = "/list")
   public R queryPageList(PatrolRecord patrolRecord, Query query) {
   public R queryPageList(PatrolRecordVO patrolRecord, Query query) {
       IPage<PatrolRecord> pageList = patrolRecordService.selectPatrolRecord(Condition.getPage(query),patrolRecord);
       return R.data(pageList);
   }