From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index 87769ee..4ae6fe8 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+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;
@@ -43,6 +43,7 @@
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="浼氳闇�姹�",index = 7,width = 10)
private String remark;
@ApiModelProperty(value = "浼氳涓婚")
@@ -105,6 +106,11 @@
@ApiModelProperty(value = "鍙栨秷澶囨敞")
private String doneInfo;
+ @ApiModelProperty(value = "鎻愬墠寮�濮嬫椂闂�")
+ private Date startTimeReal;
+ @ApiModelProperty(value = "鏄惁鍙戦�佸弬浼氫汉閫氱煡锛�0=閫氱煡锛�1=涓嶉�氱煡")
+ private Integer joinNotice;
+
@ApiModelProperty(value = "棰勭害浜�")
@TableField(exist = false)
private String realName ;
@@ -134,10 +140,16 @@
@ApiModelProperty(value = "userId")
@TableField(exist = false)
private Integer userId ;
+ @ApiModelProperty(value = "鏄惁鍏锋湁鎿嶄綔鏉冮檺(寮�濮嬨�佺粨鏉熴�佹挙鍥烇級")
+ @TableField(exist = false)
+ private Integer hasRole ;
@ApiModelProperty(value = "鍙備細浜哄憳")
@TableField(exist = false)
private List<UserRel> sysList;
+ @ApiModelProperty(value = "浼氳瀹ょ鐞嗗憳")
+ @TableField(exist = false)
+ private List<UserRel> adminList;
@ApiModelProperty(value = "鏈嶅姟椤圭洰")
@TableField(exist = false)
@@ -176,4 +188,31 @@
@ApiModelProperty(value = "浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�")
@TableField(exist = false)
private Integer meetingStatus;
+
+
+
+ @ApiModelProperty(value = "鏌ヨ鏃ユ湡 yyyy-MM-dd")
+ @TableField(exist = false)
+ private String queryDate;
+
+
+ @ApiModelProperty(value = "鏌ヨ绫诲埆锛�1=鎴戝弬涓庣殑锛�2=鎴戦绾︾殑锛�")
+ @TableField(exist = false)
+ private Integer queryType;
+
+
+ @ApiModelProperty(value = "浼氳瀹ゅ悕绉�")
+ @TableField(exist = false)
+ private String roomsName;
+
+ @ApiModelProperty(value = "浼氳瀹や富閿�")
+ @TableField(exist = false)
+ private Integer roomsId;
+ @ApiModelProperty(value = "浼氳瀹ゅ浘鐗�")
+ @TableField(exist = false)
+ private String imgurl;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏂囦欢绫诲瀷")
+ private Integer fileType;
}
--
Gitblit v1.9.3