Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-08-09 9bfa420a764f19750cbd91df897fc6ae6fd0f1cc

 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;