Merge remote-tracking branch 'origin/master'

lin

2024-03-12 02f3b2a577143724b09a70cd13cd3e9256f5fc21

 src/main/java/org/springblade/modules/house/service/IHouseholdService.java

@@ -75,7 +75,7 @@

   void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);

    Integer statistics(Long userId,String neiCode);
    Integer statistics(Long userId,String neiCode,Integer confirmFlag);

   /**
    * 住户对应物业，网格，公安负责人查询