From 52c95b4ca6e53ff53e43d80b58cc19b715e4533d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 18 Jan 2024 17:56:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.java b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.java
index b8fe153..aecce21 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.java
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.java
@@ -40,7 +40,10 @@
 	 * @param gridman
 	 * @return
 	 */
-	List<GridmanVO> selectGridmanPage(IPage page,@Param("gridman") GridmanVO gridman);
+	List<GridmanVO> selectGridmanPage(IPage page,
+									  @Param("gridman") GridmanVO gridman,
+									  @Param("regionChildCodesList") List<String> regionChildCodesList,
+									  @Param("isAdministrator") Integer isAdministrator);
 
 	/**
 	 * 网格员查询

--
Gitblit v1.9.3