From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java
similarity index 81%
rename from ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java
rename to ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java
index 9d3f15a..48a478b 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/CloudStorageProperties.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java
@@ -2,15 +2,13 @@
import lombok.Data;
-import java.util.Date;
-
/**
* OSS瀵硅薄瀛樺偍 閰嶇疆灞炴��
*
* @author Lion Li
*/
@Data
-public class CloudStorageProperties {
+public class OssProperties {
/**
* 鍩熷悕
@@ -46,10 +44,5 @@
* 鏄惁https锛圷=鏄�,N=鍚︼級
*/
private String isHttps;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private Date updateTime;
}
--
Gitblit v1.9.3