From 3d3620b81b9c2ae8e8f41ef542f0e5fa8ae43c00 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 10:53:27 +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/Bookings.java | 7 ++++++-
1 files changed, 6 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 98927c3..5e97dc8 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
@@ -107,7 +107,6 @@
@ApiModelProperty(value = "鎻愬墠寮�濮嬫椂闂�")
private Date startTimeReal;
-
@ApiModelProperty(value = "鏄惁鍙戦�佸弬浼氫汉閫氱煡锛�0=閫氱煡锛�1=涓嶉�氱煡")
private Integer joinNotice;
@@ -140,10 +139,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)
--
Gitblit v1.9.3