From b58adf14617cd852296bec9e1ca57978741c9f0a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 20 Apr 2021 01:12:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignBasicInfoVo.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 47689ff..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,13 +1,12 @@
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;
import java.util.Date;
import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
@Data
@@ -23,7 +22,10 @@
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 ="活动编码")
@@ -38,5 +40,7 @@
private SignBasicInfoJsonVo signBasicInfoJsonVo;
@ApiModelProperty(value ="奖品信息")
private List<ActivitySignAwardSetVo> activitySignAwardSetVos;
+ @ApiModelProperty(value ="签到天数")
+ private List<ActivitySignRecordVo> activitySignRecords;
}
--
Gitblit v1.9.1