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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 screen-manage/src/main/java/com/moral/api/controller/MenuController.java

@@ -79,10 +79,7 @@
        //处理插入业务
        MenuDTO dto = menuService.insertMenu(form);

        //转换前端所需参数
        MenuInsertVO vo = MenuInsertVO.convert(dto);

        return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
        return new ResultMessage(dto.getCode(), dto.getMsg(),null);
    }

    @PostMapping("delete")