From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
index 3aad54a..334497a 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java
@@ -47,8 +47,9 @@
*/
List<HouseholdVO> selectHouseholdPage(IPage page,
@Param("household") HouseholdVO household,
+ @Param("isAdministrator") Integer isAdministrator,
@Param("regionChildCodesList") List<String> regionChildCodesList,
- @Param("isAdministrator") Integer isAdministrator);
+ @Param("gridCodeList") List<String> gridCodeList);
/**
* 获取全部
@@ -91,7 +92,10 @@
*/
List<HouseHoldExcel> export(@Param("household") HouseholdVO household);
- Integer statistics(Long userId, String neiCode);
+ Integer statistics(@Param("household") HouseholdVO household,
+ @Param("isAdministrator") Integer isAdministrator,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("gridCodeList") List<String> gridCodeList);
/**
* 查询物业
--
Gitblit v1.9.3