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

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

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

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

    //获取该组织层级菜单
    Map<String,Object> selectMenusByOrgId(Integer orgId);

    //获取该组织菜单列表
    List<Menu> getMenuList(Integer orgId);
}