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/UserTopicsEntity.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 8e24c46..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;
 
 	/**
@@ -93,7 +92,17 @@
 
 	@ApiModelProperty(value = "签名地址", example = "")
 	@TableField("signature_path")
-	private String  signaturePath;
+	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