Merge remote-tracking branch 'origin/master'

linwe

2024-05-15 dfc3caadc68ac140a515f23be6de02ebac53878e

 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);