From 8bd6e0f1c84f2bc5bf2b9555d1c5fb388565db6c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 十二月 2024 19:17:12 +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 | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 61ea3b0..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,7 +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;
@@ -23,7 +26,7 @@
@Data
@ApiModel("浼氳瀹や俊鎭〃")
@TableName("`meeting_rooms`")
-public class Rooms {
+public class Rooms extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -36,7 +39,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- // @JsonFormat(pattern = "yyyy-MM-dd")
+ //
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -71,6 +74,9 @@
@ApiModelProperty(value = "瀹圭撼浜烘暟", example = "1")
@ExcelColumn(name="瀹圭撼浜烘暟")
private Integer limitNum;
+
+ @ApiModelProperty(value = "浼氳瀹ゆ枃浠剁被鍨嬶細0=鍥剧墖锛堝鍥撅級锛�1=瑙嗛锛�2=鏃�")
+ private Integer fileType;
@ApiModelProperty(value = "浼氳瀹ゅ浘鐗�")
@ExcelColumn(name="浼氳瀹ゅ浘鐗�")
@@ -110,7 +116,9 @@
@TableField(exist = false)
private String imgFullUrl;
-
+ @ApiModelProperty(value = "闄勪欢鏂囦欢")
+ @TableField(exist = false)
+ private List<Multifile> multifileList;
}
--
Gitblit v1.9.3