From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
index e2de4d8..3cdf8ef 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
@@ -27,17 +27,20 @@
private String userName;
+ private String account;
+
private String email;
private String mobile;
private String wechat;
+ private List<ManageRole> roles;
+
private List<String> roleNames;
private String createTime;
private String updateTime;
-
}
--
Gitblit v1.8.0