From 57a283d06cba1fd3a6b78af590a97372774bbca6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 15:45:03 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java b/src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java
index 51d6b39..7114439 100644
--- a/src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class PointGoodsRecordDTO extends AbstractTransDTO {
 
@@ -48,4 +50,7 @@
     private String status;
 
     private String statusStr;
+
+    @ApiModelProperty(value = "到期时间")
+    private LocalDateTime expireTime;
 }

--
Gitblit v1.9.3