Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventor...

huminmin

7 天以前 0fbedcf87c7a7b0503307597425308a42c14f67a

 src/main/java/com/ruoyi/other/controller/TempFileController.java

@@ -33,6 +33,15 @@
        }
    }

    @PostMapping("/uploadByCommon")
    public AjaxResult uploadByCommon(MultipartFile file, Integer type, Long id) {
        try {
            return AjaxResult.success(tempFileService.uploadByCommon(file, type,id));
        } catch (Exception e) {
            return AjaxResult.error(e.getMessage());
        }
    }

    @PostMapping("uploadFile")
    public AjaxResult uploadFile(@RequestBody ProductRecordDto productRecordDto) {
        try {