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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 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);