From 9adfc0c5aa084bc61807ce43badf8b9f48b588c3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 05 九月 2024 17:16:16 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

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

diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVipVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVipVO.java
index c1b88d8..3838c47 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVipVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVipVO.java
@@ -121,4 +121,42 @@
     @ApiModelProperty(value = "会员等级对象")
     private Member member;
 
+
+
+    @ApiModelProperty(value = "使用时间类型(COUPON_USAGE_TYPE)")
+    @DictTrans(target = "usageTypeName",codeType = "COUPON_USAGE_TYPE")
+    private String usageType;
+
+    @ApiModelProperty(value = "使用时间类型")
+    private String usageTypeName;
+
+
+    @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;
+
+    /**
+     * 发放数量
+     */
+    @ApiModelProperty(value = "发放数量")
+    private Integer couponAmount;
+
+    @ApiModelProperty(value = "发放时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+    @DateTimeFormat
+    private LocalDateTime createTime;
+
+
 }

--
Gitblit v1.9.3