From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期四, 09 十二月 2021 16:59:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynVO.java | 42 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 36 insertions(+), 6 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 c2f1f9f..d42fab5 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 @@ -1,12 +1,12 @@ package com.panzhihua.common.model.vos.community; +import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -45,13 +45,13 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; - @ApiModelProperty(value = "社区id",hidden = true) + @ApiModelProperty(value = "社区id", hidden = true) private Long communityId; - @ApiModelProperty(value = "当前页数",example = "1") + @ApiModelProperty(value = "当前页数", example = "1") private Long pageNum; - @ApiModelProperty(value = "每页记录数",example = "10") + @ApiModelProperty(value = "每页记录数", example = "10") private Long pageSize; @ApiModelProperty("发布搜索开始时间") @@ -65,6 +65,36 @@ @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; + + @ApiModelProperty(value = "社区动态跳转链接") + private String jumpUrl; + + @ApiModelProperty("跳转状态") + private Integer jumpType; } -- Gitblit v1.7.1