From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/entity/Article.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 8d115c3..7031698 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:业主大会 6：反诈宣传 */
+ @ApiModelProperty(value = "类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查 5:业主大会 6：反诈宣传", example = "")
@TableField("type")
private Integer type;
@@ -92,7 +92,7 @@
/** 更新时间 */
@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;
/** 更新人 */
@@ -136,4 +136,7 @@
@ApiModelProperty(value = "小区id", example = "")
@TableField("district_id")
private String districtId;
+
+ @ApiModelProperty(value = "分数", example = "")
+ private Integer score;
}
--
Gitblit v1.9.3