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

houruijun

2020-08-28 4bd194307bd9b5c78b0c43b8fbd22be1155bcc01

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/config/QiniuOSSAutoConfigure.java

@@ -96,7 +96,7 @@
        }

        @Override
        protected String FilePath(String imgType, String folderByDate) {
        protected String FilePath(String imgType, String folderByDate,String hospitalId,String departmentId) {
            return null;
        }