From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Mon, 02 Feb 2026 18:18:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwPoliceStationService.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwPoliceStationService.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwPoliceStationService.java index 3a90b9a..4947675 100644 --- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwPoliceStationService.java +++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwPoliceStationService.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import org.sxkj.fw.area.entity.FwPoliceStationEntity; +import org.sxkj.fw.area.param.FwPoliceStationQueryParam; import org.sxkj.fw.area.vo.FwPoliceStationVO; import org.sxkj.fw.area.excel.FwPoliceStationExcel; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -35,18 +36,19 @@ * 自定义分页 * * @param page - * @param fwPoliceStation + * @param param * @return */ - IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationVO fwPoliceStation); + IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, + FwPoliceStationQueryParam param); /** * 列表 * + * @param stationName * @return */ - List<FwPoliceStationVO> selectFwPoliceStationList(); - + List<FwPoliceStationVO> selectFwPoliceStationList(String stationName); /** * 导出数据 -- Gitblit v1.9.3