From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 16 一月 2025 16:52:46 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 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 7b1a7b2..e7f3cb8 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,7 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; -import com.doumee.core.model.LoginUserModel; +import com.doumee.service.business.third.model.LoginUserModel; import com.doumee.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -81,7 +81,7 @@ @ApiModelProperty(value = "浼氳鍐呭") private String content; - @ApiModelProperty(value = "鐘舵�� 0鍚敤 1绂佺敤") + @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉� ") private Integer status; @ApiModelProperty(value = "鍙栨秷浜�") @@ -93,7 +93,23 @@ @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 = "鏄惁鍙戦�佸弬浼氫汉閫氱煡锛�0=閫氱煡锛�1=涓嶉�氱煡") + private Integer joinNotice; @ApiModelProperty(value = "棰勭害浜�") @TableField(exist = false) @@ -162,4 +178,29 @@ @ApiModelProperty(value = "weekday") @TableField(exist = false) private String weekday; + + @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�") + @TableField(exist = false) + private Integer meetingStatus; + + + + @ApiModelProperty(value = "鏌ヨ鏃ユ湡 yyyy-MM-dd") + @TableField(exist = false) + private String queryDate; + + + @ApiModelProperty(value = "鏌ヨ绫诲埆锛�1=鎴戝弬涓庣殑锛�2=鎴戦绾︾殑锛�") + @TableField(exist = false) + private Integer queryType; + + + @ApiModelProperty(value = "浼氳瀹ゅ悕绉�") + @TableField(exist = false) + private String roomsName; + + @ApiModelProperty(value = "浼氳瀹や富閿�") + @TableField(exist = false) + private Integer roomsId; + } -- Gitblit v1.9.3