From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/entity/PublicDiscussEntity.java | 8 ++++++--
1 files changed, 6 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..63979a0 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是
@@ -160,4 +160,8 @@
@ApiModelProperty(value = "创建人", example = "")
@TableField("create_by")
private Long createBy;
+
+ @ApiModelProperty(value = "0：未开启 1：已开启", example = "")
+ @TableField("signature_flag")
+ private Integer signatureFlag;
}
--
Gitblit v1.9.3