Merge remote-tracking branch 'origin/master'

linwe

2023-11-11 a1d8ea1a72cddf7651742b87f042602ab006c879

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

@@ -41,7 +41,9 @@
    * @param houseRental
    * @return
    */
   List<HouseRentalTenantVO> selectHouseRentalPage(IPage page, @Param("vo") HouseRentalTenantVO houseRental);
   List<HouseRentalTenantVO> selectHouseRentalPage(IPage page,
                                       @Param("vo") HouseRentalTenantVO houseRental,
                                       @Param("list") List<String> list);

   /**
    * 查询房屋出租情况
@@ -54,5 +56,6 @@
    * 获取统计数据
    * @return
    */
   List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental);
   List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental,
                                   @Param("list") List<String> list);
}