From d9eee1919dbff7ffddc48b1f4fee2ec41a54a2a2 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 05 一月 2021 18:19:52 +0800
Subject: [PATCH] 运营后台完成

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index b825d12..4e5cf80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -25,18 +25,15 @@
     private Long id;
 
     @ApiModelProperty("活动名称")
-    @NotBlank
     private String activityName;
 
     @ApiModelProperty("负责人userID")
-    @NotNull
     private Long sponsorId;
 
     @ApiModelProperty("负责人名字")
     private String sponsorName;
 
     @ApiModelProperty("活动地址")
-    @NotBlank
     private String activityAddr;
 
     @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
@@ -48,22 +45,18 @@
 
     @ApiModelProperty("活动结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @NotNull
     private Date endAt;
 
     @ApiModelProperty("活动开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @NotNull
     private Date beginAt;
 
     @ApiModelProperty("报名开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @NotNull
     private Date signUpBegin;
 
     @ApiModelProperty("报名结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @NotNull
     private Date signUpEnd;
 
     @ApiModelProperty("志愿者人数下线")
@@ -85,7 +78,6 @@
     private Integer participantNow;
 
     @ApiModelProperty("活动封面")
-    @NotNull
     private String cover;
 
     @ApiModelProperty("是否有奖品 1 有 0  无")
@@ -95,11 +87,9 @@
     private String prizeRemark;
 
     @ApiModelProperty("奖励说明")
-    @NotBlank
     private String rewardDesc;
 
     @ApiModelProperty("活动内容")
-    @NotBlank
     private String content;
 
     @ApiModelProperty("活动奖品集合")
@@ -115,10 +105,13 @@
     private Long pageSize;
 
     @ApiModelProperty(value = "取消原因")
-    private String cancelRenson;
+    private String cancelReason;
 
     @ApiModelProperty(value = "是否已经报名 1 已报名 0 未报名")
     private Integer isSign;
+
+    @ApiModelProperty(value = "是不是以志愿者身份报名的 1 是 0 不是")
+    private Integer isVolunteer;
 
     @ApiModelProperty(value = "当前登录者id",hidden = true)
     private Integer userId;
@@ -126,5 +119,8 @@
     @ApiModelProperty("活动参加人员集合")
     private List<ActivitySignVO>activitySignVOList;
 
+    @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
+    private Integer type;
+
 
 }

--
Gitblit v1.7.1