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

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

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

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

    void allotGroups(Map<String, Object> parameters, String token);
    //用户分配组（角色）
    void allotGroups(Map<String, Object> parameters);

}