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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 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);
    List<Map<String, Object>> selectUserGroup(Map<String, Object> parameters);

}