From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/entity/UserPublicEnrollEntity.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/entity/UserPublicEnrollEntity.java b/src/main/java/org/springblade/modules/discuss/entity/UserPublicEnrollEntity.java
index 32c7cd0..a43fba8 100644
--- a/src/main/java/org/springblade/modules/discuss/entity/UserPublicEnrollEntity.java
+++ b/src/main/java/org/springblade/modules/discuss/entity/UserPublicEnrollEntity.java
@@ -21,7 +21,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springblade.core.mp.base.BaseEntity;
import java.io.Serializable;
import java.util.Date;
@@ -72,8 +71,23 @@
/** 0否 1是 */
@ApiModelProperty(value = "0否 1是", example = "")
- @TableField("delete_flag")
+ @TableField("deleted_flag")
@TableLogic
- private Integer deleteFlag;
+ private Integer deletedFlag;
+
+ @ApiModelProperty(value = "签名地址", example = "")
+ @TableField("signature_path")
+ private String signaturePath;
+
+ /**
+ * 门牌地址编码
+ */
+ @ApiModelProperty(value = "门牌地址编码")
+ @TableField("house_code")
+ private String houseCode;
+
+ @ApiModelProperty(value = "文章id", example = "")
+ @TableField("article_id")
+ private Integer articleId;
}
--
Gitblit v1.9.3