From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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..d00eb2e 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,30 @@
     @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;
+
+    @ApiModelProperty(value = "领取后有效类型名称")
+    private String usageTimeTypeName;
+
+    @ApiModelProperty(value = "领取渠道(COUPON_GET_TYPE)")
+    @DictTrans(target = "getTypeName",codeType = "COUPON_GET_TYPE")
+    private String getType;
+
+    /**
+     * 领取渠道(COUPON_GET_TYPE)首页弹窗、活动入口、领券中心
+     */
+    @ApiModelProperty(value = "领取渠道(COUPON_GET_TYPE)")
+    private String getTypeName;
+
+    /**
+     * 每人限领
+     */
+    @ApiModelProperty(value = "每人限领")
+    private Integer getLimit;
+
 }

--
Gitblit v1.9.3