Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-25 1267661c4028d4adb6629b3c6f00c686aa35eb8a

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

@@ -31,6 +31,6 @@
    Page<Group> selectGroups(Map<String, Object> parameters);

    //获取用户组（角色）
    List<Map<String, Object>> getGroupIds(Integer userId);
    Map<String, Object> getGroup(Integer userId);

}