Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

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

@@ -69,5 +69,9 @@
    */
   List<HouseRentalExcel> export(@Param("vo") HouseRentalTenantVO houseRental);

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

}