From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

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

diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/domain/SysOss.java b/ruoyi-oss/src/main/java/com/ruoyi/system/domain/SysOss.java
index a99d973..7b7639c 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/domain/SysOss.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/system/domain/SysOss.java
@@ -25,7 +25,7 @@
 	/**
 	 * 浜戝瓨鍌ㄤ富閿�
 	 */
-	@TableId(value = "oss_id")
+	@TableId(value = "oss_id", type = IdType.AUTO)
 	private Long ossId;
 
 	/**
@@ -34,6 +34,11 @@
 	private String fileName;
 
 	/**
+	 * 鍘熷悕
+	 */
+	private String originalName;
+
+	/**
 	 * 鏂囦欢鍚庣紑鍚�
 	 */
 	private String fileSuffix;

--
Gitblit v1.9.3