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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

@@ -119,10 +119,7 @@
        //处理插入业务
        SysDictTypeDTO dto = sysDictTypeService.insertType(form);

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

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

    @PostMapping("type/update")