From b9f32ef5413a1b267f86f79db169386aff61c9e7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 12 Apr 2024 09:39:00 +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