Merge remote-tracking branch 'origin/dev'

疯狂的狮子li

2021-07-28 eb2be90e74adfa06ee251f80c08243d0301ce467

 ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java

@@ -15,6 +15,8 @@
@ConfigurationProperties(prefix = "cloud-storage")
public class CloudStorageProperties {

   private Boolean previewListImage;

   private QiniuProperties qiniu;

   private AliyunProperties aliyun;