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

maven

昨天 d9ff3817f056ad245a16bd394133a407d6c6b9cf

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