Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

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

@@ -60,7 +60,9 @@
    * @return
    */
   List<HouseRentalStatistics> getStatistics(@Param("vo") HouseRentalTenantVO houseRental,
                                   @Param("list") List<String> list);
                                   @Param("gridCodeList") List<String> gridCodeList,
                                   @Param("regionChildCodesList") List<String> regionChildCodesList,
                                   @Param("isAdministrator") Integer isAdministrator);

   /**
    * 导出租赁信息