From 2079ba28f20bde46f7736699c97abf0e1564770d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 十月 2024 09:30:46 +0800
Subject: [PATCH] 最新版本
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index fcfac74..2484b0a 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -2,13 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -22,7 +23,7 @@
@Data
@ApiModel("浼氳瀹ら瀹氫俊鎭〃")
@TableName("`meeting_book`")
-public class Bookings {
+public class Bookings extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -80,7 +81,7 @@
@ApiModelProperty(value = "浼氳鍐呭")
private String content;
- @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤")
+ @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉� ")
private Integer status;
@ApiModelProperty(value = "鍙栨秷浜�")
@@ -92,7 +93,20 @@
@ApiModelProperty(value = "鍙戦�侀�氱煡锛�0=鏈彂閫� 1=宸插彂閫�")
private Integer sendNotice;
+ @ApiModelProperty(value = "鍙栨秷澶囨敞")
+ private String cancelInfo;
+ @ApiModelProperty(value = "鎻愬墠缁撴潫浜�")
+ private Integer doneUserId;
+
+ @ApiModelProperty(value = "鎻愬墠缁撴潫鏃堕棿")
+ private Date doneDate;
+
+ @ApiModelProperty(value = "鍙栨秷澶囨敞")
+ private String doneInfo;
+
+ @ApiModelProperty(value = "鎻愬墠寮�濮嬫椂闂�")
+ private Date startTimeReal;
@ApiModelProperty(value = "棰勭害浜�")
@TableField(exist = false)
@@ -161,4 +175,8 @@
@ApiModelProperty(value = "weekday")
@TableField(exist = false)
private String weekday;
+
+ @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�")
+ @TableField(exist = false)
+ private Integer meetingStatus;
}
--
Gitblit v1.9.3