From 98222128889b7943d02bfa6a9bd09782cb2bfbcb Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 21 Mar 2024 11:24:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java b/src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java
index 12860a6..887d7ca 100644
--- a/src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java
+++ b/src/main/java/org/springblade/modules/discuss/entity/UserTopicsEntity.java
@@ -77,7 +77,6 @@
 	 */
 	@ApiModelProperty(value = "0否 1是", example = "")
 	@TableField("delete_flag")
-	@TableLogic
 	private Integer deleteFlag;
 
 	/**

--
Gitblit v1.9.3