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/activity/vo/SignReceiveListVo.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java index d43dbf6..7b7d959 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java @@ -12,22 +12,29 @@ * 主键 */ private Long id; - + //活动类型 + private int actType; + @ApiModelProperty(value = "用户") private String nickName; @ApiModelProperty(value = "签到时间") - @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone="GMT+8") private Date reciveTime; @ApiModelProperty(value = "连续签到天数") private Integer cumulativeDay; + + @ApiModelProperty(value = "数量") + private Integer scoreCnt; @ApiModelProperty(value = "奖励类型") private String awardType; @ApiModelProperty(value = "获得奖励") private String awardName; + @ApiModelProperty(value = "优惠券名") + private String couponName; @ApiModelProperty(value ="奖项规则（1：每日奖励（默认）2：累计签到天数）") private int awardRule; -- Gitblit v1.9.1