From cd0cc8910180826a92451c44a55c2799d7cdca81 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java b/src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java
index 78011fa..d007073 100644
--- a/src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java
+++ b/src/main/java/org/springblade/modules/notice/entity/NoticeLikeEntity.java
@@ -16,9 +16,7 @@
*/
package org.springblade.modules.notice.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -71,6 +69,10 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("创建时间")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
+ @ApiModelProperty("是删除")
+ private Integer deleteFlag;
+
}
--
Gitblit v1.9.3