From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 20:39:32 +0800
Subject: [PATCH] 最新版本541200007

---
 server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
index eff0b41..847ab2e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java
@@ -1,12 +1,14 @@
 package com.doumee.dao.web.response;
 
 import com.doumee.dao.business.model.BookingTime;
-import com.doumee.dao.business.model.Multifile;
-import com.doumee.dao.business.model.Projects;
+import com.doumee.dao.system.model.Multifile;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.vo.UserResponse;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -34,8 +36,19 @@
     @ApiModelProperty(value = "浼氳鏃ユ湡")
     private String meetingDate;
 
+
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    private Date startTime;
+
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    private Date endTime;
+
+
     @ApiModelProperty(value = "浼氳鏃堕棿 ( a ~ b)")
     private String meetingTime;
+
+    @ApiModelProperty(value = "鏄惁鏄鐞嗗憳 0=鍚︼紱1=鏄�")
+    private Integer isAdmin = 0 ;
 
     @ApiModelProperty(value = "鍙備細浜哄憳")
     private List<UserResponse> userResponseList;
@@ -60,7 +73,9 @@
     private String bookingUserName;
 
     @ApiModelProperty(value = "浼氳棰勭害浜轰俊鎭�")
-    private UserResponse bookingUser;
+    private SystemUser bookingUser;
+//    @ApiModelProperty(value = "浼氳棰勭害浜轰俊鎭�")
+//    private UserResponse bookingUser;
 
     @ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉�")
     private Integer meetingStatus;
@@ -69,7 +84,9 @@
     private String remark;
 
     @ApiModelProperty(value = "浼氳瀹ょ鐞嗕汉")
-    private UserResponse roomUser;
+    private SystemUser roomUser;
+//    @ApiModelProperty(value = "浼氳瀹ょ鐞嗕汉")
+//    private UserResponse roomUser;
 
 
 }

--
Gitblit v1.9.3