Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-10-18 5586964c3e63f95c9e460a6a3d85d7dca408e096

 screen-api/src/main/java/com/moral/api/service/UserService.java

@@ -23,8 +23,8 @@
    //登陆
    Map<String, Object> login(Map<String, Object> parameters);

    //根据token获取用户信息
    Map<String,Object> getUserInfo(String token);
    //获取当前用户信息
    Map<String,Object> getCurrentUserInfo();

    //获取菜单
    Map<String, Object> getMenus(Map<String, Object> parameters);