From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java
index b2d167c..1e25aea 100644
--- a/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java
@@ -1,12 +1,15 @@
package com.mzl.flower.dto.response.coupon;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@ApiModel("积分记录")
@@ -123,6 +126,10 @@
@ApiModelProperty(value = "每人限领")
private Integer getLimit;
+ @ApiModelProperty(value = "发放时间")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
+ @DateTimeFormat
+ private LocalDateTime createTime;
}
--
Gitblit v1.9.3