From cd0aad10b0e6fe284eafafd932b9d4705460c04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Sun, 31 Oct 2021 21:28:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20SysOss=E3=80=81SysOs?=
 =?UTF-8?q?sConfig=20=E6=9C=AA=E7=BB=A7=E6=89=BF=20BaseEntity=20=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E5=AE=9E=E4=BD=93=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/domain/SysOss.java  | 41 +++---------------
 .../com/ruoyi/system/domain/SysOssConfig.java | 43 +++----------------
 2 files changed, 14 insertions(+), 70 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 d090c9297..0793d04fe 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
@@ -1,26 +1,23 @@
 package com.ruoyi.system.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * OSS对象存储对象
  *
  * @author Lion Li
  */
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_oss")
-public class SysOss implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
+public class SysOss extends BaseEntity {
 
 	/**
 	 * 对象存储主键
@@ -48,30 +45,6 @@ public class SysOss implements Serializable {
 	 */
 	private String url;
 
-	/**
-	 * 创建时间
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private Date createTime;
-
-	/**
-	 * 上传人
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	private String createBy;
-
-	/**
-	 * 更新时间
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private Date updateTime;
-
-	/**
-	 * 更新人
-	 */
-	@TableField(fill = FieldFill.INSERT_UPDATE)
-	private String updateBy;
-
 	/**
 	 * 服务商
 	 */
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 3a6fb835a..ff081ce90 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
@@ -1,27 +1,22 @@
 package com.ruoyi.system.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 /**
  * 对象存储配置对象 sys_oss_config
  *
- * @author ruoyi
- * @date 2021-08-11
+ * @author Lion Li
  */
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_oss_config")
-public class SysOssConfig implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
+public class SysOssConfig extends BaseEntity {
 
     /**
      * 主建
@@ -79,30 +74,6 @@ public class SysOssConfig implements Serializable {
      */
     private String ext1;
 
-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
     /**
      * 备注
      */