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

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

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

}