From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 15:59:10 +0800 Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距,和收银人 6. PC端服务单新增划扣金额展示 --- zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java index 298419d..de570bf 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java @@ -1,22 +1,19 @@ 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 com.fasterxml.jackson.annotation.JsonFormat; - @Data @ApiModel(value = "SignSuccessVo", description = "签到活动") public class SignSuccessVo { - @ApiModelProperty(value ="日常奖励名称") - private String normalAwardName; - @ApiModelProperty(value ="日常奖励图片") - private String normalAwardImg; + @ApiModelProperty(value ="奖励类型 1:日常奖励 2:累计奖励") + private int type; @ApiModelProperty(value ="累计奖励名称") private String awardName; -- Gitblit v1.9.1