From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
index a5efc5b..f05686b 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -40,16 +40,18 @@
 	 *
 	 * @param page
 	 * @param place
-	 * @param houseCodeList
+	 * @param gridCodeList
 	 * @param regionChildCodesList
+	 * @param isAdministrator
 	 * @param isAdministrator
 	 * @return
 	 */
 	List<PlaceVO> selectNinePlacePage(IPage page,
 								  @Param("place") PlaceVO place,
-								  @Param("houseCodeList") List<String> houseCodeList,
+								  @Param("gridCodeList") List<String> gridCodeList,
 								  @Param("regionChildCodesList") List<String> regionChildCodesList,
-								  @Param("isAdministrator") Integer isAdministrator);
+								  @Param("isAdministrator") Integer isAdministrator,
+								  @Param("nineTypeList") List<String> nineTypeList);
 
 
 	/**
@@ -144,7 +146,8 @@
 	List<NinePlaceExcel> export( @Param("place") PlaceVO place,
 								 @Param("houseCodeList") List<String> houseCodeList,
 								 @Param("regionChildCodesList") List<String> regionChildCodesList,
-								 @Param("isAdministrator") Integer isAdministrator);
+								 @Param("isAdministrator") Integer isAdministrator,
+								 @Param("nineTypeList") List<String> nineTypeList);
 
 	/**
 	 * 查询 警务网格为空的数据

--
Gitblit v1.9.3