From a1557f3f07287c86e8a4a408f03ba19993e5a48c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 09:41:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteLockDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteLockDTO.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteLockDTO.java
index 3feb72e..7197e80 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteLockDTO.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteLockDTO.java
@@ -21,15 +21,15 @@
/**
* 锁定开始时间
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date startTime;
/**
* 锁定结束时间
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date endTime;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private String ssTime;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private String eeTime;
}
--
Gitblit v1.7.1