From ccd87b6ac99259a01b9099a4d570f6d9e7dbb506 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 30 五月 2025 14:48:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after into li
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 10 +++++++++-
1 files changed, 9 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..acc95e1 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,19 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+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,6 +25,10 @@
@JsonIgnore
private String searchValue;
+ /** 閫昏緫鍒犻櫎瀛楁 */
+ @TableLogic
+ private Integer deleted;
+
/** 鍒涘缓鑰� */
private String createBy;
--
Gitblit v1.9.3