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

cjl

2023-08-02 ee2d9a4049baa9ecc3f43d0576fd3745688171be

 screen-api/src/main/java/com/moral/api/mapper/GroupMapper.java

@@ -16,6 +16,6 @@
 */
public interface GroupMapper extends BaseMapper<Group> {

    List<Map<String, Object>> selectUserGroup(Map<String, Object> parameters);
    Map<String, Object> selectUserGroup(Integer userId);

}