Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -48,6 +48,7 @@
   List<HouseVO> selectHousePage(IPage page,
                          @Param("house") HouseVO house,
                          @Param("regionChildCodesList") List<String> regionChildCodesList,
                          @Param("gridCodeList") List<String> gridCodeList,
                          @Param("isAdministrator") Integer isAdministrator);

   /**
@@ -102,4 +103,11 @@
                        @Param("regionChildCodesList") List<String> regionChildCodesList,
                        @Param("isAdministrator") Integer isAdministrator,
                        @Param("streetCode") String streetCode);

   /**
    * 查询未绑定网格或警格的数据
    * @param type 1:网格  2：警格
    * @return
    */
   List<HouseEntity> getNotBindGridOrJwGridList(@Param("type") Integer type);
}