From d9c45a1b92bf7b444fa3b541a3b64d7a4a326986 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 11 二月 2025 16:58:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 8 ++++++--
1 files changed, 6 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 635c6cb..8bcf5ab 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,6 +52,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("end_time")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "开始计费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("start_pay_time")
+ private LocalDateTime startPayTime;
@ApiModelProperty(value = "每月租金")
@TableField("month_rent")
@@ -65,7 +69,7 @@
@TableField("pay_type")
private String payType;
- @ApiModelProperty(value = "第一次支付日期")
+ @ApiModelProperty(value = "账单第一次支付日期 合同生效日期+10天 （不是真正的支付日期）生成第一次帐单后存值")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("first_pay_time")
private LocalDateTime firstPayTime;
@@ -76,7 +80,7 @@
@ApiModelProperty(value = "押金是否随租金递增递减 true=是 false=否")
@TableField("isIncreasing_deposit")
- private Boolean isincreasingDeposit;
+ private Boolean isIncreasingDeposit;
@ApiModelProperty(value = "违约金比例")
@TableField("proportion")
--
Gitblit v1.7.1