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

houruijun

2020-09-28 e0395c5454534e7cf657b10045d00e4042dc7e71

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