From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContractRentType.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContractRentType.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContractRentType.java
index f3f45ae..09ee915 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContractRentType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContractRentType.java
@@ -48,6 +48,9 @@
@ApiModelProperty(value = "数值")
@TableField("numerical_value")
private BigDecimal numericalValue;
+ @ApiModelProperty(value = "周期 单位年")
+ @TableField("cycle_time")
+ private Integer cycleTime;
@ApiModelProperty(value = "递增或递减时点")
@TableField("change_time")
--
Gitblit v1.7.1