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/partybuilding/PartyBuildingActivityVO.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
index 1f7af6e..b5d6e08 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java
@@ -1,12 +1,13 @@
package com.panzhihua.common.model.vos.partybuilding;
+import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -16,8 +17,7 @@
**/
@Data
@ApiModel("党员活动")
-public class
-PartyBuildingActivityVO {
+public class PartyBuildingActivityVO {
@ApiModelProperty("党员活动id")
private Long id;
@@ -86,13 +86,16 @@
@ApiModelProperty("社区id")
private Long communityId;
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
@ApiModelProperty("活动党员列表")
private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
@ApiModelProperty("是否已经报名")
private Integer isSign;
- @ApiModelProperty(value = "活动报名人员id集合",hidden = true)
+ @ApiModelProperty(value = "活动报名人员id集合", hidden = true)
private List<Long> userIds;
@ApiModelProperty("是否是小程序请求")
@@ -100,8 +103,5 @@
@ApiModelProperty("是否是个人发起 1 是 0 否")
private Integer isPerson;
-
-
-
}
--
Gitblit v1.7.1