From eb57efc4e28a2771fec52a261d0a74ca73dffec2 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 15:13:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' 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