From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送

---
 src/main/java/org/springblade/modules/article/entity/Article.java |   49 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 11 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 52577ca..1caa9c3 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -2,12 +2,9 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotNull;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -31,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:业主大会 6:反诈宣传 */
+	@ApiModelProperty(value = "类型  0:文章 1经营性收支,2:物业招标 3:公益报名 4:选举调查 5:业主大会 6:反诈宣传", example = "")
 	@TableField("type")
 	private Integer type;
 
@@ -66,6 +63,11 @@
 	@TableField("article_type")
 	private String articleType;
 
+	/** 资讯类型 */
+	@ApiModelProperty(value = "文章细类", example = "")
+	@TableField("article_subcategory")
+	private String articleSubcategory;
+
 	/** 是否推荐 1:推荐   2:不推荐 */
 	@ApiModelProperty(value = "是否推荐 1:推荐   2:不推荐", example = "")
 	@TableField("recommend")
@@ -88,14 +90,14 @@
 
 	/** 创建时间 */
 	@ApiModelProperty(value = "创建时间", example = "")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@TableField(value = "create_time",fill = FieldFill.INSERT)
+	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@TableField(value = "create_time", fill = FieldFill.INSERT)
 	private Date createTime;
 
 	/** 更新时间 */
 	@ApiModelProperty(value = "更新时间", example = "")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@TableField("update_time")
+	@TableField(value = "update_time",fill = FieldFill.UPDATE)
 	private Date updateTime;
 
 	/** 更新人 */
@@ -108,13 +110,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