Merge remote-tracking branch 'origin/master'

lin

2024-04-01 02dc776fff0c37a7c9e992fe80f0bdd0528f5e7f

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

@@ -117,4 +117,14 @@
    List<HouseholdVO> getHouseholdListByParam(List<Integer> list);

    List<TreeIntegerNode> getlabelStatistics(HouseholdVO household);

   /**
    * 通过小区id查询用户
    * @param districtIds
    * @param building
    * @param unit
    * @param name
    * @return
    */
   IPage<HouseholdVO> getUserInfoByDistrictIds(HouseholdVO householdVO,IPage<HouseholdVO> page);
}