Merge remote-tracking branch 'origin/master'

linwe

2023-11-10 cd0cc8910180826a92451c44a55c2799d7cdca81

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

@@ -129,6 +129,16 @@
   }

   /**
    * 出租屋 确认
    * @param houseRental
    * @return
    */
   @PostMapping("/confirmHouseRental")
   public R confirmHouseRental(@RequestBody HouseRentalVO houseRental) {
      return R.status(houseRentalService.confirmHouseRental(houseRental));
   }

   /**
    * 出租屋 新增或修改
    */
   @PostMapping("/submit")
@@ -158,9 +168,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));
   }