From aa411422f009e2d99ecd6c2bf6aaa75eb1416d2e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 11 九月 2024 17:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

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

diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java
index 9fe2a67..af3fa10 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateAppVO.java
@@ -119,5 +119,21 @@
     @ApiModelProperty(value = "领取后有效类型名称")
     private String usageTimeTypeName;
 
+    /**
+     * 有效开始时间
+     */
+    @ApiModelProperty(value = "有效开始时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+    @DateTimeFormat
+    private LocalDateTime effectiveStart;
+
+    /**
+     * 有效结束时间
+     */
+    @ApiModelProperty(value = "有效结束时间")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+    @DateTimeFormat
+    private LocalDateTime effectiveEnd;
+
 
 }

--
Gitblit v1.9.3