From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java b/src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java
index 3d86f70..6cbdd74 100644
--- a/src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java
+++ b/src/main/java/com/ycl/jxkg/domain/base/AbsEntity.java
@@ -1,9 +1,6 @@
package com.ycl.jxkg.domain.base;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
@@ -28,7 +25,8 @@
// @TableField(value = "gmt_update", fill = FieldFill.INSERT_UPDATE)
// private Date gmtUpdate;
- @TableField(value = "deleted", fill = FieldFill.INSERT)
+ @TableField(value = "deleted", fill = FieldFill.INSERT, select = false)
+ @TableLogic
private Integer deleted;
}
--
Gitblit v1.8.0