From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/RescueTeamManageController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/RescueTeamManageController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/RescueTeamManageController.java
index eb54a0b..6358b75 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/RescueTeamManageController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/controller/RescueTeamManageController.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.materials.entity.RescueTeamManage;
import cn.gistack.sm.materials.service.IRescueTeamManageService;
+import cn.gistack.sm.materials.vo.RescueTeamManageVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -50,8 +51,9 @@
*/
@ApiOperation(value = "分页列表查询", notes = "分页列表查询")
@GetMapping(value = "/page")
- public R queryPageList(@ApiIgnore @RequestParam Map<String, Object> rescueTeamManage, Query query) {
- IPage<RescueTeamManage> pageList = rescueTeamManageService.page(Condition.getPage(query), Condition.getQueryWrapper(rescueTeamManage,RescueTeamManage.class));
+ public R queryPageList(RescueTeamManageVO rescueTeamManage ,Query query) {
+// IPage<RescueTeamManage> pageList = rescueTeamManageService.page(Condition.getPage(query), Condition.getQueryWrapper(rescueTeamManage,RescueTeamManage.class));
+ IPage<RescueTeamManageVO> pageList = rescueTeamManageService.selectPage(Condition.getPage(query),rescueTeamManage);
return R.data(pageList);
}
--
Gitblit v1.9.3