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/partybuilding/PartyBuildingComPbDynVO.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 6f11241..afae1ba 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
@@ -17,7 +17,7 @@
@ApiModel("社区管理》党建》党员动态/政策文件")
public class PartyBuildingComPbDynVO {
- @ApiModelProperty("党建动态id")
+ @ApiModelProperty("党建动态/政策文件id")
private Long id;
@ApiModelProperty("标题")
@@ -39,6 +39,7 @@
private String cover;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("内容")
@@ -64,4 +65,20 @@
@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;
}
--
Gitblit v1.7.1