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

liyong

2 天以前 7193fdcb256c3836393bff9c3ab0efe4fa56a3c0

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