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

zhaoxiaohao

2020-07-15 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9

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