From 9c6e78ea55ef4c865b8148a5ca47322504ed1f50 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期六, 31 八月 2024 20:09:49 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java
index 8181d9b..d7f8a5a 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java
@@ -3,13 +3,13 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
-import com.mzl.flower.entity.coupon.CouponTemplateDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class CouponTemplateVO extends AbstractTransDTO {
@@ -229,4 +229,7 @@
@ApiModelProperty(value = "会员等级")
private String vipGrade;
+ @ApiModelProperty(value = "商户列表")
+ List<CouponTemplateCustomerVO> customerList;
+
}
--
Gitblit v1.9.3