From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/other/service/TempFileService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/other/service/TempFileService.java b/src/main/java/com/ruoyi/other/service/TempFileService.java
index 756a8c5..355e43c 100644
--- a/src/main/java/com/ruoyi/other/service/TempFileService.java
+++ b/src/main/java/com/ruoyi/other/service/TempFileService.java
@@ -6,5 +6,7 @@
 import java.io.IOException;
 
 public interface TempFileService {
-    TempFile uploadFile(MultipartFile file) throws IOException;
+    TempFile uploadFile(MultipartFile file,Integer type) throws IOException;
+
+    String uploadByCommon(MultipartFile file, Integer type, Long id) throws IOException;
 }

--
Gitblit v1.9.3