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

houruijun

2020-08-09 e84df331a8ee600d369eeac4172b750db563926d

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

@@ -32,5 +32,10 @@
     * 说明
     */
    private String domain;

    /**
     * 文件夹
     */
    private String folder;
}