From d485902ae91b906ce542e51936bd460f0a3a5b08 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 01 Sep 2020 16:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
index fa21dcb..18f5142 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/feign/fallback/FileServiceFallbackFactory.java
@@ -1,6 +1,7 @@
 package com.kidgrow.filecenter.feign.fallback;
 
 
+import com.kidgrow.common.model.ResultBody;
 import com.kidgrow.filecenter.feign.FileService;
 import com.kidgrow.filecenter.model.FileInfo;
 import feign.hystrix.FallbackFactory;
@@ -9,6 +10,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -33,8 +36,19 @@
             public FileInfo feignUpload(@RequestPart("file") MultipartFile file,@RequestParam String imgType) {
                 return null;
             }
+
             @Override
-            public FileInfo baseUplaod(String file, String imgType) {
+            public FileInfo baseUplaod(String file, String imgType, String hospitalId, String departmentId) {
+                return null;
+            }
+
+            @Override
+            public ResultBody baseDownLoad(Map<String, Object> map) throws Exception {
+                return null;
+            }
+
+            @Override
+            public FileInfo byteUplaod(String fileName, byte[] bytes) {
                 return null;
             }
         };

--
Gitblit v1.8.0