Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -118,7 +118,6 @@
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入houseRental")
   public R update(@RequestBody HouseRentalEntity houseRental) {
      houseRental.setUpdateTime(new Date());
      houseRental.setUpdateUser(AuthUtil.getUserId());
      return R.status(houseRentalService.updateById(houseRental));
   }
@@ -185,6 +184,7 @@

   @GetMapping("/getStatisticsCount")
   public R getStatisticsCount(HouseRentalTenantVO houseRental){
      houseRental.setUserId(AuthUtil.getUserId());
      return R.data(houseRentalService.getStatisticsCount(houseRental));
   }