Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

 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;


}