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 | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 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..517532b 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：反诈宣传 */
+ @ApiModelProperty(value = "类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查 5：反诈宣传", example = "")
@TableField("type")
private Integer type;
@@ -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,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