Merge remote-tracking branch 'origin/master'

zhongrj

2023-11-09 9e754d4c91e41b02a1e39d7ca709ec9491558da2

 src/main/java/org/springblade/modules/house/controller/HouseRentalController.java

@@ -158,9 +158,13 @@
      return R.status(houseRentalService.removeHouseRental(id));
   }

   /**
    * 获取统计数据
    * @return
    */
   @GetMapping("/getStatistics")
   public R getStatistics(){
      return R.data(houseRentalService.getStatistics());
   public R getStatistics(HouseRentalTenantVO houseRental){
      return R.data(houseRentalService.getStatistics(houseRental));
   }