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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

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

@@ -9,10 +9,7 @@
import com.moral.api.pojo.form.sysDictType.SysDictTypeDeleteForm;
import com.moral.api.pojo.form.sysDictType.SysDictTypeInsertForm;
import com.moral.api.pojo.form.sysDictType.SysDictTypeUpdateForm;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeDeleteVO;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeInsertVO;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeQueryVO;
import com.moral.api.pojo.vo.sysDictType.SysDictTypeUpdateVO;
import com.moral.api.service.SysDictDataService;
import com.moral.api.service.SysDictTypeService;
import com.moral.constant.ResponseCodeEnum;
@@ -132,10 +129,7 @@
        //处理更新业务
        SysDictTypeDTO dto = sysDictTypeService.updateType(form);

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

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

    @PostMapping("type/delete")
@@ -148,10 +142,7 @@
        //处理删除业务
        SysDictTypeDTO dto = sysDictTypeService.deleteType(form);

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

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

}