From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/domain/Meeting.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 103 insertions(+), 0 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
new file mode 100644
index 0000000..ed6e0f3
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/Meeting.java
@@ -0,0 +1,103 @@
+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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
+@TableName("meeting")
+public class Meeting {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 鏍囬
+     */
+    @Excel(name = "鏍囬")
+    private String title;
+    /**
+     * 鍦扮偣
+     */
+    @Excel(name = "鍦扮偣")
+    private String place;
+    /**
+     * 鍙绾充汉鏁�
+     */
+    @Excel(name = "鍙绾充汉鏁�")
+    private int conPeople;
+    /**
+     * 鍙備笌浜烘暟
+     */
+    @Excel(name = "鍙備笌浜烘暟")
+    private int partPeople;
+    /**
+     * 鐢宠浜�
+     */
+    @Excel(name = "鐢宠浜�")
+    private String applyPerson;
+    /**
+     * 鐢宠閮ㄩ棬鎴栧搴�
+     */
+    @Excel(name = "鐢宠閮ㄩ棬鎴栧搴�")
+    private String applyApart;
+    /**
+     * 寮�濮嬫椂闂�
+     */
+    @Excel(name = "寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @Excel(name = "缁撴潫鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+
+    /**
+     * 寮�濮嬪紑浼氭椂闂�
+     */
+    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+    private Timestamp happenStartTime;
+
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP)
+    private Timestamp happenEndTime;
+    /**
+     * 鏄惁鎽嗘斁姘寸墝
+     */
+    @Excel(name = "鏄惁鎽嗘斁姘寸墝")
+    private int isPlacebrand;
+    /**
+     * 鑱旂郴浜�
+     */
+    @Excel(name = "鑱旂郴浜�")
+    private String connPerson;
+    /**
+     * 鑱旂郴鐢佃瘽
+     */
+    @Excel(name = "鑱旂郴鐢佃瘽")
+    private String connPhone;
+    /**
+     * 鐘舵��
+     */
+    @Excel(name = "鐘舵��")
+    private int statu;
+    /**
+     * 鐢熸垚鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+
+}

--
Gitblit v1.9.1