From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据,不设置网格信息

---
 src/main/java/org/springblade/modules/article/entity/Article.java |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 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..8d115c3 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;
 
@@ -88,8 +85,8 @@
 
 	/** 创建时间 */
 	@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;
 
 	/** 更新时间 */
@@ -108,13 +105,35 @@
 	@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;
 }

--
Gitblit v1.9.3