From d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 三月 2025 22:11:24 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java | 30 +++++++++++++++++++++---------
1 files changed, 21 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 59db724..c9072be 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,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;
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -16,9 +19,9 @@
**/
@Data
@ApiModel("党员活动")
-public class
-PartyBuildingActivityVO {
+public class PartyBuildingActivityVO {
@ApiModelProperty("党员活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("活动名称")
@@ -77,11 +80,17 @@
@ApiModelProperty("取消原因")
private String cancelReason;
- @ApiModelProperty("发布人")
- private String createBy;
+ @ApiModelProperty("发布人id")
+ private Long createBy;
+
+ @ApiModelProperty("发布人名字")
+ private String createByName;
@ApiModelProperty("社区id")
private Long communityId;
+
+ @ApiModelProperty("社区名称")
+ private String communityName;
@ApiModelProperty("活动党员列表")
private List<PartyBuildingMemberVO> partyBuildingMemberVOS;
@@ -89,13 +98,16 @@
@ApiModelProperty("是否已经报名")
private Integer isSign;
- @ApiModelProperty(value = "活动报名人员id集合",hidden = true)
+ @ApiModelProperty(value = "活动报名人员id集合", hidden = true)
private List<Long> userIds;
@ApiModelProperty("是否是小程序请求")
private Integer isAppliets;
+ @ApiModelProperty("是否是个人发起 1 是 0 否")
+ private Integer isPerson;
-
+ @ApiModelProperty("二维码类型 1居民，志愿者 2党员")
+ private Integer codeType;
}
--
Gitblit v1.7.1