From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java b/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java
index dc7946d..d2fb605 100644
--- a/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java
+++ b/server/service/src/main/java/com/doumee/dao/system/vo/SystemUserListVO.java
@@ -23,18 +23,33 @@
@ApiModelProperty(value = "宀椾綅淇℃伅")
private List<SystemPosition> positions;
-
- @ApiModelProperty(value = "閮ㄩ棬淇℃伅")
- private SystemDepartment department;
+//
+// @ApiModelProperty(value = "閮ㄩ棬淇℃伅")
+// private SystemDepartment department;
@ApiModelProperty(value = "鍒涘缓浜轰俊鎭�")
private SystemUser createUserInfo;
@ApiModelProperty(value = "鏇存柊浜轰俊鎭�")
private SystemUser updateUserInfo;
+
@ApiModelProperty(value = "浼佷笟鍚嶇О")
private String companyName;
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ private String companyDepartmentPathName;
+
+ @ApiModelProperty(value = "缁勭粐涓婚敭")
+ private Integer companyDepartmentId;
+
+ @ApiModelProperty(value = "鍏ㄧ粍缁囦富閿�")
+ private String companyDepartmentPathId;
+
+ @ApiModelProperty(value = "宸叉巿鏉冧紒涓氭暟")
+ private Integer authNum;
+
+ @ApiModelProperty(value = "鏄惁瓒呯 1=鏄紱0=鍚�")
+ private String isAdmin;
@ApiModelProperty(value = "涓绘挱绔湴鍧�")
private String zhuboRoomUrl;
--
Gitblit v1.9.3