From 88de0b5169112f8ea908cc2c048bc34286f8851d Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 26 Feb 2024 13:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 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 f05686b..6dfec06 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -36,6 +36,22 @@
 
 
 	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param place
+	 * @param houseCodeList
+	 * @param regionChildCodesList
+	 * @param isAdministrator
+	 * @return
+	 */
+	List<PlaceVO> selectPlacePage(IPage page,
+								  @Param("place") PlaceVO place,
+								  @Param("gridCodeList") List<String> gridCodeList,
+								  @Param("regionChildCodesList") List<String> regionChildCodesList,
+								  @Param("isAdministrator") Integer isAdministrator);
+
+	/**
 	 * 九小场所档案
 	 *
 	 * @param page
@@ -53,22 +69,6 @@
 								  @Param("isAdministrator") Integer isAdministrator,
 								  @Param("nineTypeList") List<String> nineTypeList);
 
-
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param place
-	 * @param houseCodeList
-	 * @param regionChildCodesList
-	 * @param isAdministrator
-	 * @return
-	 */
-	List<PlaceVO> selectPlacePage(IPage page,
-								  @Param("place") PlaceVO place,
-								  @Param("houseCodeList") List<String> houseCodeList,
-								  @Param("regionChildCodesList") List<String> regionChildCodesList,
-								  @Param("isAdministrator") Integer isAdministrator);
 
 	/**
 	 * 查询场所集合信息

--
Gitblit v1.9.3