Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

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

@@ -75,4 +75,13 @@
   void importUserHouseHold(List<HouseHoldExcel> data, Boolean isCovered);

    Integer statistics(Long userId);

   /**
    * 住户对应物业，网格，公安负责人查询
    * @param household
    * @return
    */
    Object getHouseholdOtherInfo(HouseholdVO household);

   Object getHouseHoldStatistics(String code, String roleType);
}