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

liyong

2 天以前 a4e8861ba00ae449814d7a6d53f8ab9a0a6dbf93

 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;
}