From f547171a98907dbd9f824f145df4c902ff121683 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 20 九月 2024 10:13:49 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 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 c979bea..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; @@ -73,6 +75,9 @@ @ExcelColumn(name="瀹圭撼浜烘暟") private Integer limitNum; + @ApiModelProperty(value = "浼氳瀹ゆ枃浠剁被鍨嬶細0=鍥剧墖锛堝鍥撅級锛�1=瑙嗛锛�2=鏃�") + private Integer fileType; + @ApiModelProperty(value = "浼氳瀹ゅ浘鐗�") @ExcelColumn(name="浼氳瀹ゅ浘鐗�") private String imgurl; @@ -111,7 +116,9 @@ @TableField(exist = false) private String imgFullUrl; - + @ApiModelProperty(value = "闄勪欢鏂囦欢") + @TableField(exist = false) + private List<Multifile> multifileList; } -- Gitblit v1.9.3