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

jinpengyong

2023-07-31 2b5e23042827c66c936d6aeaa004f42b95236d52

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

}