From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
index 5b80f37..a94a2c8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/MeetingStatistic.java
@@ -2,7 +2,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
+
@Data
@TableName("meeting_statistic")
public class MeetingStatistic {
@@ -37,6 +41,22 @@
* 鐘舵��
*/
private int status;
+ /**
+ * 寮�濮嬪紑浼氭椂闂�
+ */
+ @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private Date happenStartTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
+ private Date happenEndTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
--
Gitblit v1.9.1