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/MeetingListResponse.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 4c21bae..d06e228 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
@@ -1,5 +1,6 @@
package com.doumee.dao.web.response;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
@@ -16,7 +18,7 @@
*/
@Data
@ApiModel("浼氳鍒楄〃杩斿洖绫�")
-public class MeetingListResponse{
+public class MeetingListResponse{
@ApiModelProperty(value = "涓婚敭")
private Integer id;
@@ -33,11 +35,13 @@
@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)
+ @ApiModelProperty(value = "鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉�",hidden = true)
private Integer status;
@ApiModelProperty(value = "浼氳棰勭害浜�")
@@ -46,6 +50,12 @@
@ApiModelProperty(value = "浼氳瀹ゅ浘鐗�")
private String imgUrl;
+ @ApiModelProperty(value = "鏂囦欢绫诲瀷")
+ private Integer fileType;
+
+ @ApiModelProperty(value = "浼氳瀹ら檮浠朵俊鎭�")
+ private List<Multifile> multifileList;
+
@ApiModelProperty(value = "鍓嶇紑")
private String prefixUrl;
--
Gitblit v1.9.3