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

kaiyu

2021-04-09 51c36e6f6b17862714fbd5c42da43386dc05d28a

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