From 8d3ba202bc4ea038054f3efadfc1e51ce4581e6d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 26 四月 2024 13:03:56 +0800
Subject: [PATCH] 修改代码
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 fc26062..c1453e2 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,13 +50,13 @@
* 寮�濮嬫椂闂�
*/
@Excel(name = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
@Excel(name = "缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date endTime;
@@ -95,8 +94,8 @@
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Timestamp createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date createTime;
}
--
Gitblit v1.9.1