From 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingDetailResponse.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 41d2f7a..9bfbc1c 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
@@ -3,10 +3,12 @@
import com.doumee.dao.business.model.BookingTime;
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;
/**
@@ -21,6 +23,8 @@
@ApiModelProperty(value = "涓婚敭")
private Integer id;
+ @ApiModelProperty(value = "鏄惁宸插垹闄�")
+ private Integer isdeleted;
@ApiModelProperty(value = "浼氳鍚嶇О")
private String meetingName;
@@ -34,12 +38,22 @@
@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;
- private List<SystemUser> userResponseList;
+ private List<UserResponse> userResponseList;
@ApiModelProperty(value = "浼氳鍐呭")
private String meetingContent;
--
Gitblit v1.9.3