From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
index ef5d593..75b5aee 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
@@ -1,8 +1,10 @@
package com.doumee.dao.business.model;
+import cn.hutool.core.img.Img;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -37,7 +39,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- // @JsonFormat(pattern = "yyyy-MM-dd")
+ //
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -72,6 +74,9 @@
@ApiModelProperty(value = "瀹圭撼浜烘暟", example = "1")
@ExcelColumn(name="瀹圭撼浜烘暟")
private Integer limitNum;
+
+ @ApiModelProperty(value = "浼氳瀹ゆ枃浠剁被鍨嬶細0=鍥剧墖锛堝鍥撅級锛�1=瑙嗛锛�2=鏃�")
+ private Integer fileType;
@ApiModelProperty(value = "浼氳瀹ゅ浘鐗�")
@ExcelColumn(name="浼氳瀹ゅ浘鐗�")
@@ -111,7 +116,9 @@
@TableField(exist = false)
private String imgFullUrl;
-
+ @ApiModelProperty(value = "闄勪欢鏂囦欢")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
}
--
Gitblit v1.9.3