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

jinpengyong

2023-09-27 6712b6d4d3bd39713d387fead75b7d65f8d157c2

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

}