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

houruijun

2020-07-28 adb3ce843d546135c8acca47a9649b4264463849

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/properties/FileServerProperties.java

@@ -34,4 +34,6 @@
     */
    FdfsProperties fdfs = new FdfsProperties();



}