From 5d3b07a294a1bd3d6e01f3f2f9e0ec8b80f7cc0f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 14 Aug 2020 15:54:12 +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 |    3 ++-
 1 files changed, 2 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 e58d115..0874c21 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
@@ -36,8 +36,9 @@
             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;
             }
 

--
Gitblit v1.8.0