From 3be6fa0c0e6eca79a08ee3b4f30bc882388b9cc1 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 三月 2025 17:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java
index c2f05a3..cdc21ef 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java
@@ -3,8 +3,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.util.Date;
@Data
@ApiModel(value = "终止合同DTO")
@@ -16,4 +18,8 @@
@ApiModelProperty(value = "备注说明")
private String terminateRemark;
+ @ApiModelProperty(value = "终止日期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date terminateTime;
+
}
--
Gitblit v1.7.1