From cd0aad10b0e6fe284eafafd932b9d4705460c04f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 31 十月 2021 21:28:19 +0800
Subject: [PATCH] fix 修复 SysOss、SysOssConfig 未继承 BaseEntity 基础实体问题
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java | 43 +++------------------
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java | 41 +++-----------------
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 d090c92..0793d04 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,12 +1,12 @@
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瀵硅薄瀛樺偍瀵硅薄
@@ -14,13 +14,10 @@
* @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 {
/**
* 瀵硅薄瀛樺偍涓婚敭
@@ -47,30 +44,6 @@
* URL鍦板潃
*/
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 3a6fb83..ff081ce 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 {
/**
* 涓诲缓
@@ -78,30 +73,6 @@
* 鎵╁睍瀛楁
*/
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;
/**
* 澶囨敞
--
Gitblit v1.9.3