From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog

---
 src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
index 5054411..5de2215 100644
--- a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.java
+++ b/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);
 
 
 }

--
Gitblit v1.9.3