Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2022-09-08 ee7e761c606518f7791fc96ff0a9b6ae197091dc

 src/main/java/com/whyc/controller/MaterialController.java

@@ -76,7 +76,7 @@
    /**物料id-物料编码-物料型号*/
    @ApiOperation(value = "追加附件",notes = "materialStr为json字符串,包含id,subCode,subModel")
    @PostMapping("attachment")
    public Response addAttachment(@RequestParam MultipartFile multipartFile,@RequestParam String materialStr){
    public Response addAttachment(@RequestParam MultipartFile multipartFile,@RequestParam String materialStr) throws IOException {
        Material material = ActionUtil.getGson().fromJson(materialStr, Material.class);
        return service.addAttachment(multipartFile,material);
    }