From 8c56f523f74d9265056cf72a0f4aa22d708b1dba Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 03 六月 2025 09:12:05 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 15bf66b..7ebfb7a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -4,15 +4,21 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
/**
* Entity鍩虹被
- *
+ *
* @author ruoyi
*/
+@Data
public class BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -21,18 +27,26 @@
@JsonIgnore
private String searchValue;
+ /** 閫昏緫鍒犻櫎瀛楁 */
+ @TableLogic
+ private Integer deleted;
+
/** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
/** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
/** 澶囨敞 */
--
Gitblit v1.9.3