From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyBuildingActivityVO.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 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 b7ffaff..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 {
-    @ApiModelProperty("党员id")
+public class PartyBuildingActivityVO {
+    @ApiModelProperty("党员活动id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     @ApiModelProperty("活动名称")
@@ -41,6 +44,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;
@@ -75,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;
@@ -87,7 +98,16 @@
     @ApiModelProperty("是否已经报名")
     private Integer isSign;
 
+    @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