Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java

@@ -36,9 +36,16 @@
    *
    * @param page
    * @param policeAlarmRecords
    * @param isAdministrator
    * @param regionChildCodesList
    * @param gridCodeList
    * @return
    */
   List<PoliceAlarmRecordsVO> selectPoliceAlarmRecordsPage(IPage page, @Param("vo") PoliceAlarmRecordsVO policeAlarmRecords);
   List<PoliceAlarmRecordsVO> selectPoliceAlarmRecordsPage(IPage page,
                                             @Param("vo") PoliceAlarmRecordsVO policeAlarmRecords,
                                             @Param("isAdministrator") Integer isAdministrator,
                                             @Param("regionChildCodesList") List<String> regionChildCodesList,
                                             @Param("gridCodeList") List<String> gridCodeList);


}