From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
index 8ed9d79..bd53d26 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -32,8 +33,8 @@
@ApiModelProperty("是否置顶 0 否 1 是")
private Integer isTopping;
- @ApiModelProperty("发布时间")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty(value = "发布时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date publishAt;
@ApiModelProperty("创建时间")
@@ -47,10 +48,10 @@
@ApiModelProperty(value = "社区id",hidden = true)
private Long communityId;
- @ApiModelProperty("当前页数")
+ @ApiModelProperty(value = "当前页数",example = "1")
private Long pageNum;
- @ApiModelProperty("每页记录数")
+ @ApiModelProperty(value = "每页记录数",example = "10")
private Long pageSize;
@ApiModelProperty("发布搜索开始时间")
@@ -63,4 +64,31 @@
@ApiModelProperty("动态内容富文本")
private String content;
+
+ @ApiModelProperty("动态内容富文本--纯文本")
+ private String contentText;
+
+ @ApiModelProperty(value = "社区名字")
+ private String communityName;
+
+ @ApiModelProperty(value = "封面")
+ private String cover;
+
+ @ApiModelProperty(value = "是否增加 1 增加 0 不增加")
+ private Integer isAdd;
+
+ @ApiModelProperty(value = "社区动态分类id")
+ private Long type;
+
+ @ApiModelProperty(value = "社区动态分类名称")
+ private String typeName;
+
+ @ApiModelProperty(value = "社区动态分类颜色")
+ private String typeColor;
+
+ @ApiModelProperty(value = "封面模式：1-小图展示 2-大图展示")
+ private Integer coverMode;
+
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
}
--
Gitblit v1.7.1