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/article/entity/Article.java |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/entity/Article.java b/src/main/java/org/springblade/modules/article/entity/Article.java
index 830baa7..517532b 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -28,8 +28,8 @@
 	@TableField("title")
 	private String title;
 
-	/** 类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查 */
-	@ApiModelProperty(value = "类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查", example = "")
+	/** 类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查 5:反诈宣传 */
+	@ApiModelProperty(value = "类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查 5:反诈宣传", example = "")
 	@TableField("type")
 	private Integer type;
 
@@ -105,13 +105,38 @@
 	@TableField("create_user")
 	private Long createUser;
 
-	/** 是否删除 0:否  1:是 */
+	/**
+	 * 是否删除 0:否  1:是
+	 */
 	@ApiModelProperty(value = "是否删除 0:否  1:是", example = "")
 	@TableField("is_deleted")
 	private Integer isDeleted;
 
-	/** 资讯范围 */
+	/**
+	 * 资讯范围
+	 */
 	@ApiModelProperty(value = "资讯范围", example = "")
 	@TableField("article_range")
 	private String articleRange;
+
+	/**
+	 * 楼栋
+	 */
+	@ApiModelProperty(value = "楼栋", example = "")
+	@TableField("building")
+	private String building;
+
+	/**
+	 * 单元
+	 */
+	@ApiModelProperty(value = "单元", example = "")
+	@TableField("unit")
+	private String unit;
+
+	@ApiModelProperty(value = "小区id", example = "")
+	@TableField("district_id")
+	private String districtId;
+
+	@ApiModelProperty(value = "分数", example = "")
+	private Integer score;
 }

--
Gitblit v1.9.3