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

jinpengyong

2021-06-23 a4d06b1354d48d94c8e07d716863bcb7d3876a07

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

@@ -16,7 +16,9 @@
 */
public interface GroupMenuService extends IService<GroupMenu> {

    //分配菜单
    void allotMenus(Map<String, Object> parameters);

    //获取组（角色）所有菜单集合
    List<Integer> getMenusIds(Integer groupId);
}