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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

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

}