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

liyong

7 天以前 cf17e9b3e34d1f14f5b9ed41e4eeb82c744cb218

 src/main/java/com/ruoyi/other/service/TempFileService.java

@@ -6,5 +6,5 @@
import java.io.IOException;

public interface TempFileService {
    TempFile uploadFile(MultipartFile file) throws IOException;
    TempFile uploadFile(MultipartFile file,Integer type) throws IOException;
}