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

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-biz/src/main/java/com/kidgrow/filecenter/service/IFileService.java

@@ -6,6 +6,7 @@
import com.kidgrow.filecenter.model.FileInfo;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.io.InputStream;
import java.util.Map;

@@ -43,7 +44,7 @@
     */
    ResultBody baseDownLoad(Map<String, Object> map) throws Exception;

    FileInfo byteUplaod(String fileName, InputStream inputStream, int size);
    FileInfo byteUplaod(String fileName, InputStream inputStream, int size) throws IOException;
    /**
     * 文件上传 根据fileType选择上传方式 hospitalId  departmentId
     * @param file