From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 12 Jun 2021 17:47:38 +0800 Subject: [PATCH] 新增赠送项目是否计算消耗控制 --- 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