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

liyong

昨天 7cc6419a2419408f6578f30b3396c99bc83605e1

 src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java

@@ -81,7 +81,7 @@
    }

    @PostMapping("/upload")
    public AjaxResult uploadFile(MultipartFile file, Long id, String type) {
    public AjaxResult uploadFile(MultipartFile file, Long id, Integer type) {
        try {
            return AjaxResult.success(commonFileService.uploadFile(file, id, type));
        } catch (Exception e) {