Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-04-16 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b

 screen-api/src/main/java/com/moral/api/service/UserGroupService.java

@@ -16,7 +16,7 @@
 */
public interface UserGroupService extends IService<UserGroup> {

    void allotGroups(Map<String, Object> parameters, String token);
    void allotGroups(Map<String, Object> parameters);

    List<Integer> getGroupIds(Integer userId);
}