From da124bc60214876ec2b00d00d865b14cf9bb9535 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 12 二月 2025 09:48:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 e146dcd..5a87bcd 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
@@ -52,7 +52,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("end_time")
private LocalDateTime endTime;
- @ApiModelProperty(value = "开始计费事件")
+ @ApiModelProperty(value = "开始计费时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("start_pay_time")
private LocalDateTime startPayTime;
@@ -64,6 +64,9 @@
@ApiModelProperty(value = "押金")
@TableField("deposit")
private BigDecimal deposit;
+ @ApiModelProperty(value = "变动后递增或递减之后的每月租金 前端忽略")
+ @TableField("change_rent")
+ private BigDecimal changeRent;
@ApiModelProperty(value = "租金支付方式 月付 季付 年付")
@TableField("pay_type")
@@ -73,6 +76,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("first_pay_time")
private LocalDateTime firstPayTime;
+ @ApiModelProperty(value = "变动时间 根据周期改变 前端忽略")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("change_time")
+ private LocalDateTime changeTime;
@ApiModelProperty(value = "是否递增递减 true=是 false=否")
@TableField("isIncreasing")
@@ -80,7 +87,7 @@
@ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
@TableField("isIncreasing_deposit")
- private Boolean isincreasingDeposit;
+ private Boolean isIncreasingDeposit;
@ApiModelProperty(value = "违约金比例")
@TableField("proportion")
--
Gitblit v1.7.1