From 728a54cc02ff66e38bc8719ecc0f3155e597084c Mon Sep 17 00:00:00 2001 From: zhangmei <645025773@qq.com> Date: 星期五, 14 二月 2025 15:27:56 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang into xizang-changyun --- ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java index 5a87bcd..800f497 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java @@ -133,6 +133,16 @@ @TableField("remark") private String remark; + /** + * 1 待提交 + * 2 待审批 + * 3 未签订 + * 4 已签订 + * 5 已驳回 + * 6 已终止 + * 7 待结算 + * 8 已结算 + */ @ApiModelProperty(value = "状态 待提交 待审批 未签订 已签订....") @TableField("status") private String status; @@ -151,5 +161,8 @@ @ApiModelProperty(value = "合计年租金") @TableField("total_year") private BigDecimal totalYear; + @ApiModelProperty(value = "房屋名称") + @TableField(exist = false) + private String houseName; } -- Gitblit v1.7.1