From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/other/controller/TempFileController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/other/controller/TempFileController.java b/src/main/java/com/ruoyi/other/controller/TempFileController.java
index 6834d13..1ed7875 100644
--- a/src/main/java/com/ruoyi/other/controller/TempFileController.java
+++ b/src/main/java/com/ruoyi/other/controller/TempFileController.java
@@ -18,10 +18,10 @@
private TempFileService tempFileService;
@PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file) {
+ public AjaxResult uploadFile(MultipartFile file, Integer type) {
try {
- return AjaxResult.success(tempFileService.uploadFile(file));
- }catch (Exception e) {
+ return AjaxResult.success(tempFileService.uploadFile(file, type));
+ } catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
}
--
Gitblit v1.9.3