From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/entity/PublicDiscussEntity.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/entity/PublicDiscussEntity.java b/src/main/java/org/springblade/modules/discuss/entity/PublicDiscussEntity.java
index 247e8b2..8bb4744 100644
--- a/src/main/java/org/springblade/modules/discuss/entity/PublicDiscussEntity.java
+++ b/src/main/java/org/springblade/modules/discuss/entity/PublicDiscussEntity.java
@@ -115,9 +115,9 @@
* 0：否 1 是
*/
@ApiModelProperty(value = "0：否 1 是", example = "")
- @TableField("delete_flag")
+ @TableField("deleted_flag")
@TableLogic
- private Integer deleteFlag;
+ private Integer deletedFlag;
/**
* 多房屋可重复投票 0否 1是
--
Gitblit v1.9.3