From 078ce36a32bc6679f32e42fd18a9cbb454ff7b7d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 11:38:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 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 30785d7..635c6cb 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
@@ -53,30 +53,30 @@
@TableField("end_time")
private LocalDateTime endTime;
- @ApiModelProperty(value = "合计租金")
- @TableField("total_rent")
- private BigDecimal totalRent;
+ @ApiModelProperty(value = "每月租金")
+ @TableField("month_rent")
+ private BigDecimal monthRent;
@ApiModelProperty(value = "押金")
@TableField("deposit")
private BigDecimal deposit;
- @ApiModelProperty(value = "租金支付方式 1=月付 2=季付 3=年付")
+ @ApiModelProperty(value = "租金支付方式 月付 季付 年付")
@TableField("pay_type")
- private Integer payType;
+ private String payType;
@ApiModelProperty(value = "第一次支付日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("first_pay_time")
private LocalDateTime firstPayTime;
- @ApiModelProperty(value = "是否递增递减 1=是 0=否")
+ @ApiModelProperty(value = "是否递增递减 true=是 false=否")
@TableField("isIncreasing")
- private Integer isIncreasing;
+ private Boolean isIncreasing;
- @ApiModelProperty(value = "押金是否随租金递增递减 1=是 0=否")
+ @ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
@TableField("isIncreasing_deposit")
- private Integer isincreasingDeposit;
+ private Boolean isincreasingDeposit;
@ApiModelProperty(value = "违约金比例")
@TableField("proportion")
@@ -122,9 +122,9 @@
@TableField("remark")
private String remark;
- @ApiModelProperty(value = "状态 1=待提交 2=待审批 3=未签订 4=已签订")
+ @ApiModelProperty(value = "状态 待提交 待审批 未签订 已签订....")
@TableField("status")
- private Integer status;
+ private String status;
@ApiModelProperty(value = "内存大小多个文件逗号拼接")
@TableField("memory")
private String memory;
@@ -134,5 +134,11 @@
@ApiModelProperty(value = "租户确认合同电子签名")
@TableField("signature")
private String signature;
+ @ApiModelProperty(value = "终止合同备注说明")
+ @TableField("terminate_remark")
+ private String terminateRemark;
+ @ApiModelProperty(value = "合计年租金")
+ @TableField("total_year")
+ private BigDecimal totalYear;
}
--
Gitblit v1.7.1