From c689f2d200bd884546aac8b87d33cbe53f03b5ba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 25 Jan 2024 11:15:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
index d5e815a..a4aff95 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
+++ b/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);
}
@@ -171,4 +171,5 @@
public R getHistoryRecord(PatrolRecordVO patrolRecordVO){
return R.data(patrolRecordService.getHistoryRecord(patrolRecordVO));
}
+
}
--
Gitblit v1.9.3