From 8b13ca9086a609ef3bae76dab15faba55123d2dd Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期三, 17 三月 2021 09:17:47 +0800
Subject: [PATCH] 处理合并代码问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 89c25f3..1f7af6e 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
@@ -18,7 +18,7 @@
@ApiModel("党员活动")
public class
PartyBuildingActivityVO {
- @ApiModelProperty("党员id")
+ @ApiModelProperty("党员活动id")
private Long id;
@ApiModelProperty("活动名称")
@@ -41,6 +41,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("活动开始时间")
private Date activityTimeBegin;
+ @ApiModelProperty("活动开始时间-格式化后的")
+ private String activityTimeBeginFormat;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("活动结束时间")
private Date activityTimeEnd;
@@ -57,11 +59,14 @@
@ApiModelProperty("每页记录数")
private Long pageSize;
- @ApiModelProperty("活动参入人数")
+ @ApiModelProperty("活动最多参入人数")
private Integer participationNum;
@ApiModelProperty("活动最低参入人数-未达到到时间自动取消")
private Integer participationLowestNum;
+
+ @ApiModelProperty("活动已经参与人数")
+ private Integer participationActualNum;
@ApiModelProperty("活动封面")
private String cover;
@@ -72,8 +77,11 @@
@ApiModelProperty("取消原因")
private String cancelReason;
- @ApiModelProperty("发布人")
- private String createBy;
+ @ApiModelProperty("发布人id")
+ private Long createBy;
+
+ @ApiModelProperty("发布人名字")
+ private String createByName;
@ApiModelProperty("社区id")
private Long communityId;
@@ -82,7 +90,16 @@
private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
@ApiModelProperty("是否已经报名")
- private Boolean isSign;
+ private Integer isSign;
+
+ @ApiModelProperty(value = "活动报名人员id集合",hidden = true)
+ private List<Long> userIds;
+
+ @ApiModelProperty("是否是小程序请求")
+ private Integer isAppliets;
+
+ @ApiModelProperty("是否是个人发起 1 是 0 否")
+ private Integer isPerson;
--
Gitblit v1.7.1