From 3201bba04baf50d368fbc4ac11658701e97a0a97 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 05 三月 2025 09:59:05 +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 |    6 ++++++
 1 files changed, 6 insertions(+), 0 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..55b465e 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
@@ -140,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)

--
Gitblit v1.9.3