From 1b77c2724e38d087f3eab4a2f27b3b165f4265dc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 25 五月 2026 14:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide

---
 src/main/java/com/ruoyi/safety/pojo/SafetyBaseEntity.java |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/safety/pojo/SafetyBaseEntity.java b/src/main/java/com/ruoyi/safety/pojo/SafetyBaseEntity.java
new file mode 100644
index 0000000..15114a1
--- /dev/null
+++ b/src/main/java/com/ruoyi/safety/pojo/SafetyBaseEntity.java
@@ -0,0 +1,43 @@
+package com.ruoyi.safety.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class SafetyBaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("create_by")
+    private String createBy;
+
+    @TableField(condition = "create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @TableField("update_by")
+    private String updateBy;
+
+    @TableField(condition = "update_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    private String remark;
+
+    @TableField("del_flag")
+    @TableLogic(value = "0", delval = "1")
+    private Integer delFlag;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long tenantId;
+}

--
Gitblit v1.9.3