Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.java

@@ -17,6 +17,7 @@
package org.sxkj.fw.area.mapper;

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.mapper.BaseMapper;
@@ -37,18 +38,18 @@
    * 自定义分页
    *
    * @param page
    * @param fwPoliceStation
    * @param param
    * @return
    */
   List<FwPoliceStationVO> selectFwPoliceStationPage(IPage page, FwPoliceStationVO fwPoliceStation);
   List<FwPoliceStationVO> selectFwPoliceStationPage(IPage page, FwPoliceStationQueryParam param);

   /**
    * 列表
    *
    * @param stationName
    * @return
    */
   List<FwPoliceStationVO> selectFwPoliceStationList();

   List<FwPoliceStationVO> selectFwPoliceStationList(String stationName);

   /**
    * 获取导出数据