Merge remote-tracking branch 'origin/master'

zhongrj

2024-01-31 a5c2a3b99f46866a666618bc461340aa4e679b1c

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

@@ -44,7 +44,9 @@
    */
   List<HouseRentalTenantVO> selectHouseRentalPage(IPage page,
                                       @Param("vo") HouseRentalTenantVO houseRental,
                                       @Param("list") List<String> list);
                                       @Param("list") List<String> list,
                                       @Param("regionChildCodesList") List<String> regionChildCodesList,
                                       @Param("isAdministrator") Integer isAdministrator);

   /**
    * 查询房屋出租情况