From d1cc113ac2ce39f6a06ab0a838ccf538766580c2 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 三月 2025 17:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/TerminateContractDTO.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 cdc21ef..351f424 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
@@ -6,7 +6,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
@Data
@ApiModel(value = "终止合同DTO")
@@ -20,6 +20,6 @@
@ApiModelProperty(value = "终止日期")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date terminateTime;
+ private LocalDateTime terminateTime;
}
--
Gitblit v1.7.1