From 017a4a668610a554e554d910e547ae9f05537c0e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 31 三月 2025 10:30:26 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang

---
 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