From b822ea020a6d4edec0d183af32532076cdca062c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 09 May 2024 20:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/mapper/HouseMapper.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
index b26c950..638887e 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.java
@@ -80,7 +80,14 @@
 
 	Integer getHouseStatisticsOne(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
 
-	Integer getHouseStatisticsTwo(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
+	Integer getHouseStatisticsTwo(@Param("code") String code,
+								  @Param("aoiCode") String aoiCode,
+								  @Param("buildingCode") String buildingCode,
+								  @Param("unitCode") String unitCode,
+								  @Param("house") HouseVO house,
+								  @Param("isAdministrator") Integer isAdministrator,
+								  @Param("regionChildCodesList")List<String> regionChildCodesList,
+								  @Param("gridCodeList")List<String> gridCodeList);
 
 	Integer getHouseStatisticsThree(String code, Long userId, String aoiCode, String buildingCode, String unitCode, String roleType);
 

--
Gitblit v1.9.3