From cae3b043d8a8a08e176839d0c23a4432e5d9f5f4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 15:14:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.java b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.java
index 346b8b0..460705f 100644
--- a/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.java
+++ b/src/main/java/org/springblade/modules/rotation/mapper/RotationMapper.java
@@ -36,9 +36,14 @@
 	 *
 	 * @param page
 	 * @param rotation
+	 * @param isAdministrator
 	 * @return
 	 */
-	List<RotationVO> selectRotationPage(IPage page,@Param("rotation") RotationVO rotation);
+	List<RotationVO> selectRotationPage(IPage page,
+										@Param("rotation") RotationVO rotation,
+										@Param("isAdministrator") Integer isAdministrator,
+										@Param("regionChildCodesList") String regionChildCodesList,
+										@Param("gridCodeList") String gridCodeList);
 
 
 }

--
Gitblit v1.9.3