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

luliqiang

2020-06-12 abee95ff7de4b3514022b758044e77793f74896f

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