From 8498553a007f331534d454711eacea0086b6fdbf Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 17 Nov 2023 15:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/service/IHouseholdService.java |    6 +++++-
 1 files changed, 5 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 2144683..6171201 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -20,8 +20,8 @@
 import org.springblade.common.node.TreeNode;
 import org.springblade.modules.house.entity.HouseholdEntity;
 import org.springblade.modules.house.vo.HouseholdVO;
-import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.house.excel.HouseHoldExcel;
 
 import java.util.List;
 
@@ -69,4 +69,8 @@
 	 * @return
 	 */
 	Object getDetail(HouseholdEntity household);
+
+    List<HouseHoldExcel> export(HouseholdVO household);
+
+	void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
 }

--
Gitblit v1.9.3