Merge remote-tracking branch 'origin/master'

lin

2024-04-01 a5466b1cba84d1b5eee924a3038dd095e4b82b69

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

@@ -71,7 +71,7 @@
    */
   List<HouseRentalExcel> export(@Param("vo") HouseRentalTenantVO houseRental);

   Integer getStatisticsCount(@Param("house") HouseRentalTenantVO houseRental,
   Integer getStatisticsCount(@Param("vo") HouseRentalTenantVO houseRental,
                        @Param("regionChildCodesList") List<String> regionChildCodesList,
                        @Param("gridCodeList") List<String> gridCodeList,
                        @Param("isAdministrator") Integer isAdministrator);