From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminUserVo.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminUserVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminUserVo.java
index 9f22a8e..e4b1093 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminUserVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminUserVo.java
@@ -2,6 +2,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,6 +14,9 @@
@ApiModelProperty(value = "用户ID")
private Long id;
+
+ @ApiModelProperty(value = "所属ID")
+ private Long belongId;
@ApiModelProperty(value = "用户名")
private String username;
@@ -25,8 +30,8 @@
@ApiModelProperty(value = "邮箱")
private String email;
- @ApiModelProperty(value = "角色名称")
- private String roleName;
+ @ApiModelProperty(value = "角色")
+ private List<AdminRoleVo> AdminRoleVos;
@ApiModelProperty(value = "账号状态 0：禁用 1：激活")
private Integer status;
--
Gitblit v1.9.1