From 10e83311f7457f07b3d0928fba0de6a5622f1748 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期四, 06 三月 2025 09:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

---
 zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java b/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java
index 746f4c9..14ede4d 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/core/domain/BaseEntity.java
@@ -1,5 +1,6 @@
 package com.zhitan.common.core.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -26,20 +27,25 @@
     private String searchValue;
 
     /** 鍒涘缓鑰� */
+    @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.UPDATE)
     private String updateBy;
 
     /** 鏇存柊鏃堕棿 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
     /** 澶囨敞 */
+    @TableField(exist = false)
     private String remark;
 
     /** 鏁版嵁鏉冮檺 */

--
Gitblit v1.9.3