From 7f56f78fbaa4569873bccc9a5169518d79412b94 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 十一月 2025 14:57:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/prod' into dev_tide_mom

---
 src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java |  132 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 132 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
new file mode 100644
index 0000000..7df4b0a
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
@@ -0,0 +1,132 @@
+package com.ruoyi.collaborativeApproval.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 浼氳鑽夌琛�
+ * @TableName meet_draft
+ */
+@TableName(value ="meet_draft")
+@Data
+public class MeetDraft implements Serializable {
+    /**
+     * 鑽夌ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 浼氳缂栧彿
+     */
+    @TableField(value = "room_id")
+    private Long roomId;
+
+    /**
+     * 浼氳涓婚
+     */
+    @TableField(value = "title")
+    @Excel(name = "浼氳涓婚")
+    private String title;
+
+    /**
+     * 涓绘寔浜�
+     */
+    @TableField(value = "host")
+    @Excel(name = "涓绘寔浜�")
+    private String host;
+
+    /**
+     * 浼氳鏃ユ湡
+     */
+    @TableField(value = "meeting_date")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate meetingDate;
+
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    @TableField(value = "start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @TableField(value = "end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+
+    /**
+     * 鍙備細浜烘暟
+     */
+    @TableField(value = "participants")
+    @Excel(name = "鍙備細浜烘暟")
+    private Integer participants;
+
+    /**
+     * 鍙備細浜哄憳鍒楄〃
+     */
+    @TableField(value = "participant_list")
+    private String participantList;
+
+    /**
+     * 浼氳璇存槑
+     */
+    @TableField(value = "description")
+    private String description;
+
+    /**
+     * 鍒涘缓浜�
+     */
+    @TableField(value = "creator")
+    private String creator;
+
+
+    /**
+     * 鍒涘缓鑰�
+     */
+    @TableField(value = "create_user" ,fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 鏇存柊鑰�
+     */
+    @TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    /**
+     * 鏇存柊鏃堕棿
+     */
+    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 绉熸埛ID
+     */
+    @TableField(value = "tenant_id",fill = FieldFill.INSERT)
+    private Long tenantId;
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

--
Gitblit v1.9.3