Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -110,4 +110,17 @@
    * @return
    */
   List<HouseEntity> getNotBindGridOrJwGridList(@Param("type") Integer type);

   /**
    * 按房屋标签统计
    * @param house
    * @param isAdministrator
    * @param regionChildCodesList
    * @param gridCodeList
    * @return
    */
   List<Map<String, Object>> getHouseLabelStatistic(@Param("house") HouseVO house,
                                        @Param("isAdministrator") Integer isAdministrator,
                                        @Param("regionChildCodesList")List<String> regionChildCodesList,
                                        @Param("gridCodeList")List<String> gridCodeList);
}