From dfc3caadc68ac140a515f23be6de02ebac53878e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 17:57:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseholdService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
index eaea7f4..7f94fa7 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -21,6 +21,7 @@
 import org.springblade.common.node.TreeIntegerNode;
 import org.springblade.common.node.TreeStringNode;
 import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.excel.ExportHouseholdExcel;
 import org.springblade.modules.house.excel.ImportHouseholdExcel;
 import org.springblade.modules.house.vo.HouseholdVO;
 
@@ -71,7 +72,12 @@
 	 */
 	Object getDetail(HouseholdEntity household);
 
-    List<ImportHouseholdExcel> export(HouseholdVO household);
+	/**
+	 * 导出住户信息
+	 * @param household
+	 * @return
+	 */
+    List<ExportHouseholdExcel> export(HouseholdVO household);
 
 	String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered);
 

--
Gitblit v1.9.3