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

kaiyu

2021-04-12 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed

 screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java

@@ -30,7 +30,6 @@
    public Map<String, Object> selectMenusByOrgId(Integer orgId) {
        Map<String, Object> map = new HashMap<>();
        map.put("orgId",orgId);
        Map<String, Object> menus = userService.getMenus(map);
        return menus;
        return userService.getMenus(map);
    }
}