From 074485f56f073cf11fb29e6aab4ec9a2d4f3f549 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 九月 2024 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/response/MeetingListResponse.java | 10 +++++++++-
1 files changed, 9 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 01d666c..4556429 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.
@@ -39,7 +41,7 @@
@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 = "浼氳棰勭害浜�")
@@ -48,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