From 10c28ce3d0b384584c77ce9111a66a0641250752 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 27 二月 2025 18:30:32 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 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..eb49449 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 @@ -2,15 +2,14 @@ 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.SystemUser; +import com.doumee.service.business.third.model.LoginUserModel; +import com.doumee.dao.system.model.Multifile; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; import java.math.BigDecimal; import java.util.Date; @@ -37,7 +36,7 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - // @JsonFormat(pattern = "yyyy-MM-dd") + // private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -72,6 +71,9 @@ @ApiModelProperty(value = "瀹圭撼浜烘暟", example = "1") @ExcelColumn(name="瀹圭撼浜烘暟") private Integer limitNum; + + @ApiModelProperty(value = "浼氳瀹ゆ枃浠剁被鍨嬶細0=鍥剧墖锛堝鍥撅級锛�1=瑙嗛锛�2=鏃�") + private Integer fileType; @ApiModelProperty(value = "浼氳瀹ゅ浘鐗�") @ExcelColumn(name="浼氳瀹ゅ浘鐗�") @@ -110,8 +112,13 @@ @ApiModelProperty(value = "鍥剧墖鍏ㄨ矾寰�") @TableField(exist = false) private String imgFullUrl; + @ApiModelProperty(value = "鏈粨鏉熶細璁褰曟暟") + @TableField(exist = false) + private Integer bookingNum; - + @ApiModelProperty(value = "闄勪欢鏂囦欢") + @TableField(exist = false) + private List<Multifile> multifileList; } -- Gitblit v1.9.3