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/CouponTemplateUserVO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateUserVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateUserVO.java
index 99fd2eb..5593b1f 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateUserVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateUserVO.java
@@ -10,6 +10,7 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @ApiModel("用户优惠券")
@@ -96,4 +97,7 @@
     @ApiModelProperty(value = "操作人")
     private String createByName;
 
+    @ApiModelProperty(value = "商户列表")
+    List<CouponTemplateCustomerVO> customerList;
+
 }

--
Gitblit v1.9.3