From 0e7584f11e1da29ce07f5f21048197dd155f1574 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 09:47:17 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingComPbDynVO.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 9e142ca..c9b2c35 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,15 @@
package com.panzhihua.common.model.vos.partybuilding;
+import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -18,6 +22,7 @@
public class PartyBuildingComPbDynVO {
@ApiModelProperty("党建动态/政策文件id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("标题")
@@ -39,6 +44,7 @@
private String cover;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("内容")
@@ -65,10 +71,36 @@
@ApiModelProperty("社区id")
private Long communityId;
+ @ApiModelProperty("社区id集合")
+ private List<Long> communityIds;
+
@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;
+
+ @ApiModelProperty("政策分类: 1-社工人才政策 2-社会组织培育政策 3-其他政策")
+ private Integer policyType;
+ @ApiModelProperty(value = "查询筛选：0-本小区 1-全部")
+ private Integer choice;
+ @ApiModelProperty("排序方式 正序 ASC")
+ private String sort;
+
+ private String appId;
}
--
Gitblit v1.7.1