From cdf57ef11128f7df6f216c1c717ac783c625fa1b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 14 Apr 2021 17:31:59 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java |    3 ++-
 1 files changed, 2 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..479beb2 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
@@ -33,11 +33,12 @@
 
     private String wechat;
 
+    private List<ManageRole> roles;
+
     private List<String> roleNames;
 
     private String createTime;
 
     private String updateTime;
-
 
 }

--
Gitblit v1.8.0