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

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDTO.java

@@ -19,4 +19,8 @@
    private ManageAccount account;

    private List<ManageRole> roles;

    private Integer code;

    private String msg;
}