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/activity/dto/SignWriteoffListDto.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java b/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java index 5acbdc0..43b04b2 100644 --- a/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java +++ b/zq-erp/src/main/java/com/matrix/system/activity/dto/SignWriteoffListDto.java @@ -1,9 +1,6 @@ package com.matrix.system.activity.dto; -import java.util.Date; - import com.matrix.core.pojo.BasePageQueryDto; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,6 +11,9 @@ @ApiModelProperty(value ="中奖者姓名") private String zjzxm; + + @ApiModelProperty(value ="活动名称/编码") + private String hdmcbm; @ApiModelProperty(hidden = true) private Long companyId; -- Gitblit v1.9.1