From 2124957e815ab67a6ad34f03546bac3e5e0c7685 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 26 Apr 2021 18:23:10 +0800 Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop --- zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java | 5 +++++ 1 files changed, 5 insertions(+), 0 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 42540cf..661707f 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 @@ -22,12 +22,17 @@ @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