From e80adff2cfff2fa9d29aff9e5a7f2feb52681ef8 Mon Sep 17 00:00:00 2001
From: liuke <123456>
Date: Fri, 11 Dec 2020 18:34:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/properties/OssProperties.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/properties/OssProperties.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/properties/OssProperties.java
index 9b9aabd..e3001fb 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/java/com/kidgrow/filecenter/properties/OssProperties.java
+++ b/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;
 }
 

--
Gitblit v1.8.0