From a1647a5152e3d368ec2fb738ca7cc858e220d06c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 09:15:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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..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
@@ -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,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)
@@ -162,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