From 6b682c53501606e656d4c4812d5a2db1e92a5e74 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期四, 25 四月 2024 22:13:23 +0800
Subject: [PATCH] 修改代码

---
 zhang-content/src/main/java/com/ruoyi/domain/Meeting.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
index 4bf2f5a..832d8b2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -9,7 +9,6 @@
 import lombok.Data;
 import org.joda.time.DateTime;
 
-import java.sql.Timestamp;
 import java.util.Date;
 
 @Data
@@ -51,14 +50,14 @@
      * 寮�濮嬫椂闂�
      */
     @Excel(name = "寮�濮嬫椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     /**
      * 缁撴潫鏃堕棿
      */
     @Excel(name = "缁撴潫鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Timestamp endTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
 
     /**
@@ -95,8 +94,8 @@
     /**
      * 鐢熸垚鏃堕棿
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private Timestamp createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
 
 }

--
Gitblit v1.9.1