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

maven

昨天 61b1802b1b26fc35c07fd09edc4ff2ff8ade6688

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