From 4cdff25609300b4613aa2539c8b04976df65bc33 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 六月 2024 18:28:33 +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/web/response/MeetingListResponse.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java
index 9788683..01d666c 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * Created by IntelliJ IDEA.
@@ -32,6 +33,15 @@
     @ApiModelProperty(value = "浼氳鏃堕棿 ( a ~ b)")
     private String meetingTime;
 
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+
+    @ApiModelProperty(value = "浼氳寮�濮嬫椂闂�",hidden = true)
+    private Date startTime;
+
+    @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� ",hidden = true)
+    private Integer status;
+
     @ApiModelProperty(value = "浼氳棰勭害浜�")
     private String bookingUser;
 
@@ -41,7 +51,7 @@
     @ApiModelProperty(value = "鍓嶇紑")
     private String prefixUrl;
 
-    @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉�")
+    @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�")
     private Integer meetingStatus;
 
 }

--
Gitblit v1.9.3