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

cjl

2023-09-28 fb759782181908c9d91054ad1da9c039b8fb0dab

 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(int userId);
    Map<String, Object> selectUserGroup(Integer userId);

}