From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
index 6fb1263..fd0e48d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java
@@ -1,5 +1,6 @@
package com.matrix.system.shopXcx.api.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,18 +22,25 @@
public static final int JOINSTATE_NOTSIGN = 1;
public static final int JOINSTATE_SIGN = 2;
-
+
+ @ApiModelProperty(value ="当前累计签到天数")
+ private int actAumulativeDay;
+
@ApiModelProperty(value ="活动名称")
private String actName;
@ApiModelProperty(value ="活动编码")
private String actCode;
@ApiModelProperty(value ="活动开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
private Date beginTime;
@ApiModelProperty(value ="活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8")
private Date endTime;
@ApiModelProperty(value ="活动基本参数")
private SignBasicInfoJsonVo signBasicInfoJsonVo;
@ApiModelProperty(value ="奖品信息")
private List<ActivitySignAwardSetVo> activitySignAwardSetVos;
+ @ApiModelProperty(value ="签到天数")
+ private List<ActivitySignRecordVo> activitySignRecords;
}
--
Gitblit v1.9.1