From 8063ee7eee51bfe25a09428e6efc60f828b270c6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/mybatis/BaseIdAndDeleteEntity.java |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/mybatis/BaseIdAndDeleteEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseIdAndDeleteEntity.java
new file mode 100644
index 0000000..7ca9902
--- /dev/null
+++ b/framework/src/main/java/cn/lili/mybatis/BaseIdAndDeleteEntity.java
@@ -0,0 +1,40 @@
+package cn.lili.mybatis;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+
+/**
+ * 鏁版嵁搴撳熀纭�瀹炰綋绫�
+ *
+ * @author Chopper
+ * @version v1.0
+ * @since 2020/8/20 14:34
+ */
+@Data
+@JsonIgnoreProperties(value = { "handler", "fieldHandler"})
+@AllArgsConstructor
+@NoArgsConstructor
+public abstract class BaseIdAndDeleteEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId
+    @ApiModelProperty(value = "鍞竴鏍囪瘑", hidden = true)
+    private String id;
+
+
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "鍒犻櫎鏍囧織 true/false 鍒犻櫎/鏈垹闄�", hidden = true)
+    private Boolean deleteFlag;
+
+}

--
Gitblit v1.8.0