From a92e296c28d4c09055f53293378da001117ec979 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 02 九月 2024 17:13:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateUserVO.java |   13 +++++++++++++
 1 files changed, 13 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 5593b1f..b7d4179 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
@@ -100,4 +100,17 @@
     @ApiModelProperty(value = "商户列表")
     List<CouponTemplateCustomerVO> customerList;
 
+    /**
+     * 领取后有效类型(COUPON_usage_time_type)天、小时、分钟
+     */
+    @ApiModelProperty(value = "领取后有效类型(COUPON_USAGE_TIME_TYPE)")
+    @DictTrans(target = "usageTimeTypeName",codeType = "COUPON_USAGE_TIME_TYPE")
+    private String usageTimeType;
+
+    /**
+     * 领取后有效时间整数,比如90(天,小时,分钟)
+     */
+    @ApiModelProperty(value = "领取后有效时间整数")
+    private Integer usageTimeNum;
+
 }

--
Gitblit v1.9.3