Merge remote-tracking branch 'origin/master'

linwe

2024-05-15 dfc3caadc68ac140a515f23be6de02ebac53878e

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.java

@@ -23,6 +23,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.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
@@ -85,12 +86,15 @@
   HouseholdVO getHouseholdListById(@Param("household") HouseholdEntity household);

   /**
    * 导出
    * 导出住户信息
    *
    * @param household
    * @return
    */
   List<ImportHouseholdExcel> export(@Param("household") HouseholdVO household);
   List<ExportHouseholdExcel> export(@Param("household") HouseholdVO household,
                             @Param("isAdministrator") Integer isAdministrator,
                             @Param("regionChildCodesList") List<String> regionChildCodesList,
                             @Param("gridCodeList") List<String> gridCodeList);

   Integer statistics(@Param("household") HouseholdVO household,
                  @Param("isAdministrator") Integer isAdministrator,