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/dto/TContractDTO.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java
new file mode 100644
index 0000000..0659eb1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TContractDTO.java
@@ -0,0 +1,31 @@
+package com.ruoyi.system.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.TTenant;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel(value = "合同新增编辑DTO")
+public class TContractDTO extends TContract {
+ @ApiModelProperty(value = "递增递减 1=递增 2=递减")
+ private Integer increasingDecreasing;
+
+ @ApiModelProperty(value = "递增递减形式 1=百分比 2=金额元")
+ private Integer increasingDecreasingType;
+
+ @ApiModelProperty(value = "数值")
+ private BigDecimal numericalValue;
+
+ @ApiModelProperty(value = "递增或递减时点")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime changeTime;
+ @ApiModelProperty(value = "周期 单位年")
+ private Integer cycleTime;
+}
--
Gitblit v1.7.1