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

zhaoxiaohao

2020-08-14 5d3b07a294a1bd3d6e01f3f2f9e0ec8b80f7cc0f

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