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

houruijun

2020-08-13 d526d571cbe0a950e777fb325978d72f3ddb302b

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