Merge remote-tracking branch 'origin/dev'

疯狂的狮子li

2021-07-28 eb2be90e74adfa06ee251f80c08243d0301ce467

 ruoyi-oss/src/main/java/com/ruoyi/oss/constant/CloudConstant.java

@@ -12,7 +12,9 @@
    */
   public final static String CLOUD_STORAGE_CONFIG_KEY = "sys.oss.cloudStorageService";

   public final static String DEFAULT_CONTENT_TYPE = "application/octet-stream";

   /**
    * 预览列表资源开关Key
    */
   public final static String PEREVIEW_LIST_RESOURCE_KEY = "sys.oss.previewListResource";

}