Merge remote-tracking branch 'origin/master'

linwe

2024-05-15 fe81eb39c7402082f54e6aaee491efbcbb1aa50a

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