Merge remote-tracking branch 'origin/master'

xuhy

2025-01-22 87691e2c99d235ac73648aad0c2937e3df993c8c

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java

@@ -12,12 +12,14 @@
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TContractRentType;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.query.TContractQuery;
import com.ruoyi.system.query.THouseQuery;
import com.ruoyi.system.query.TUserHistoryQuery;
import com.ruoyi.system.service.TContractRentTypeService;
import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.vo.HouseVO;
import io.swagger.annotations.Api;
import com.ruoyi.system.vo.TContractVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -48,6 +50,11 @@
    private TContractRentTypeService contractRentTypeService;
    @Autowired
    private THouseService houseService;
    @ApiOperation(value = "获取合同分页列表")
    @PostMapping(value = "/contractList")
    public AjaxResult<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
        return AjaxResult.success(contractService.contractList(query));
    }
    @Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
    @ApiOperation(value = "新增合同")
    @PostMapping(value = "/addContract")