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

zss

昨天 6ed4b397bb9dbb9c2d7bb0676339721fa97996bf

 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 {