From ca4034c3a285f2c22fa19e5eaa88d505b5588c0b Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 29 十二月 2021 10:48:40 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
index d330d81..296610e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java
@@ -1,11 +1,12 @@
package com.panzhihua.common.model.vos.partybuilding;
+import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -39,6 +40,7 @@
private String cover;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("内容")
@@ -65,7 +67,24 @@
@ApiModelProperty("社区id")
private Long communityId;
+ @ApiModelProperty("动态内容富文本--纯文本")
+ private String contentText;
@ApiModelProperty(value = "是否增加 1 增加 0 不增加")
private Integer isAdd;
+
+ @ApiModelProperty("动态分类：1-党建动态 2-党员帮扶 3-党员示范")
+ private Integer dynType;
+
+ @ApiModelProperty("封面模式：1-小图展示 2-大图展示")
+ private Integer coverMode;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ @ApiModelProperty("跳转链接")
+ private String jumpUrl;
+
+ @ApiModelProperty("跳转状态")
+ private Integer jumpType;
}
--
Gitblit v1.7.1