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 | 15 +++++++++------
1 files changed, 9 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 aa37835..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,7 +7,10 @@
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;
import java.util.Date;
@Data
@@ -49,7 +52,7 @@
* 寮�濮嬫椂闂�
*/
@Excel(name = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/**
* 缁撴潫鏃堕棿
@@ -62,14 +65,14 @@
/**
* 寮�濮嬪紑浼氭椂闂�
*/
- @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;
/**
* 鏄惁鎽嗘斁姘寸墝
*/
@@ -93,7 +96,7 @@
/**
* 鐢熸垚鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date createTime;
--
Gitblit v1.9.1