Merge branch 'cjl' into qa

cjl

2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2

 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")