From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
index 72b49d3..458cfcc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActRegistVO.java
@@ -4,7 +4,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import java.util.Date;
/**
@@ -21,12 +22,15 @@
public class ComActActRegistVO {
@ApiModelProperty("自增id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long id;
@ApiModelProperty("所属活动id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long activityId;
@ApiModelProperty("用户id, 和用户信息表的相关id关联")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@ApiModelProperty("名字")
@@ -54,8 +58,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
- @ApiModelProperty("是否是志愿者 0 否 1 是")
- private Integer isVolunteer;
+ @ApiModelProperty("以什么身份报名（1.居民 2.党员 3.志愿者）")
+ private Integer signIdentity;
@ApiModelProperty("用户openid")
private String openid;
@@ -68,4 +72,33 @@
@ApiModelProperty(value = "签到位置")
private String position;
+
+ @ApiModelProperty(value = "签到次数")
+ private Integer times;
+
+ @ApiModelProperty(value = "二维码id")
+ private Long codeId;
+
+ @ApiModelProperty(value = "本次签到获取的积分奖励")
+ private Integer award;
+
+ @ApiModelProperty(value = "活动类型 1居民，志愿者 2党员")
+ private Integer activityType;
+
+ @ApiModelProperty("签到开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("签到结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date endTime;
+
+ @ApiModelProperty("1签到 2签退")
+ private Integer signType;
+
+ @ApiModelProperty("时长")
+ private Integer duration;
+
+ @ApiModelProperty("活动状态 1 待发布 2 未开始 3 报名中 4 进行中 5 已结束 6 已取消")
+ private Integer status;
}
\ No newline at end of file
--
Gitblit v1.7.1