Merge remote-tracking branch 'origin/master'

guoshilong

2023-11-03 fb798e4982a392408b3e8324c69baba0824fe3fd

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

@@ -26,6 +26,7 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
@@ -35,6 +36,8 @@
import org.springblade.modules.house.wrapper.HouseRentalWrapper;
import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.core.boot.ctrl.BladeController;

import java.util.Date;

/**
 * 出租屋 控制器
@@ -108,7 +111,9 @@
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入houseRental")
   public R update(@Valid @RequestBody HouseRentalEntity houseRental) {
   public R update(@RequestBody HouseRentalEntity houseRental) {
      houseRental.setUpdateTime(new Date());
      houseRental.setUpdateUser(AuthUtil.getUserId());
      return R.status(houseRentalService.updateById(houseRental));
   }