From 1f1d4e2defd90f16a4229b9bf98114f42c91405d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 12 十月 2021 11:47:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into satoken

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
index cb21fec..3a6fb83 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java
@@ -9,7 +9,7 @@
 import java.math.BigDecimal;
 
 /**
- * 浜戝瓨鍌ㄩ厤缃璞� sys_oss_config
+ * 瀵硅薄瀛樺偍閰嶇疆瀵硅薄 sys_oss_config
  *
  * @author ruoyi
  * @date 2021-08-11
@@ -60,7 +60,7 @@
     private String endpoint;
 
     /**
-     * 鏄惁htpps锛�0鍚� 1鏄級
+     * 鏄惁https锛�0鍚� 1鏄級
      */
     private String isHttps;
 

--
Gitblit v1.9.3