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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

 screen-manage/src/main/java/com/moral/api/service/ManageRoleService.java

@@ -30,4 +30,6 @@

    @Transactional
    Map<String,Object> deleteManageRole(Map map);

    ManageRole getRoleByAccountId(Integer accountId);
}