Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-system-service/src/main/java/cn/com/ty/lift/system/config/SystemConfiguration.java

@@ -36,15 +36,17 @@ public class SystemConfiguration {
 
     /**
      * 配置aliyun OSS bean注入
+     *
      * @return
      */
     @Bean
-    public AliyunOSSUtil createAliyunOSSUtil(){
-        if(StrUtil.hasEmpty(endpoint,accessKeyId,accessKeySecret)){
+    public AliyunOSSUtil createAliyunOSSUtil() {
+        if (StrUtil.hasEmpty(endpoint, accessKeyId, accessKeySecret)) {
             return AliyunOSSUtil.me();
         }
-        return AliyunOSSUtil.me(endpoint,accessKeyId,accessKeySecret);
+        return AliyunOSSUtil.me(endpoint, accessKeyId, accessKeySecret, bucketName);
     }
+
     /**
      * 将Long类型转为string类型传给前端
      *