From 1b0953e72217f63bbc83d15d49afd5f1cb6577f8 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 28 四月 2024 23:19:52 +0800
Subject: [PATCH] 修改了memo代码
---
zhang-content/src/main/java/com/ruoyi/domain/Meeting.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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..d945927 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
import org.joda.time.DateTime;
import java.sql.Timestamp;
@@ -51,27 +52,27 @@
* 寮�濮嬫椂闂�
*/
@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")
+ private Date endTime;
/**
* 寮�濮嬪紑浼氭椂闂�
*/
- @TableField(exist = false)
- private Date happenStartTime;
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Timestamp happenStartTime;
/**
* 缁撴潫鏃堕棿
*/
- @TableField(exist = false)
- private Date happenEndTime;
+ @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+ private Timestamp happenEndTime;
/**
* 鏄惁鎽嗘斁姘寸墝
*/
@@ -95,8 +96,8 @@
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private Timestamp createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date createTime;
}
--
Gitblit v1.9.1