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

gongchunyi

23 小时以前 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

@@ -7,4 +7,6 @@

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

    String uploadByCommon(MultipartFile file, Integer type, Long id) throws IOException;
}