From fe81eb39c7402082f54e6aaee491efbcbb1aa50a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 15 May 2024 13:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/IHouseholdService.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 8cc5315..eaea7f4 100644
--- a/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
+++ b/src/main/java/org/springblade/modules/house/service/IHouseholdService.java
@@ -21,7 +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.HouseHoldExcel;
+import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.vo.HouseholdVO;
import java.util.List;
@@ -71,9 +71,9 @@
*/
Object getDetail(HouseholdEntity household);
- List<HouseHoldExcel> export(HouseholdVO household);
+ List<ImportHouseholdExcel> export(HouseholdVO household);
- void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);
+ String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered);
Integer statistics(Long userId,String neiCode,Integer confirmFlag);
--
Gitblit v1.9.3