From 76a2e7f8e5978e9ee13d7401c7153820b309cd6d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 09:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

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

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
index 7b7639c..d090c92 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java
@@ -9,7 +9,7 @@
 import java.util.Date;
 
 /**
- * OSS浜戝瓨鍌ㄥ璞�
+ * OSS瀵硅薄瀛樺偍瀵硅薄
  *
  * @author Lion Li
  */
@@ -23,7 +23,7 @@
 
 
 	/**
-	 * 浜戝瓨鍌ㄤ富閿�
+	 * 瀵硅薄瀛樺偍涓婚敭
 	 */
 	@TableId(value = "oss_id", type = IdType.AUTO)
 	private Long ossId;

--
Gitblit v1.9.3