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

---
 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java
index 3f1218c..288837d 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java
@@ -144,4 +144,12 @@
     @ApiModelProperty(value = "领取后有效时间整数")
     private Integer usageTimeNum;
 
+    @ApiModelProperty(value = "使用时间类型(COUPON_USAGE_TYPE)")
+    @DictTrans(target = "usageTypeName",codeType = "COUPON_USAGE_TYPE")
+    private String usageType;
+
+    @ApiModelProperty(value = "使用时间类型")
+    private String usageTypeName;
+
+
 }

--
Gitblit v1.9.3