From 263a13a155ec759b1cb26cc00edd640f4d2e747c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 19 九月 2024 16:46:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java | 7 +++++++
1 files changed, 7 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 172db6f..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,8 +5,12 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
+
@Data
public class PointGoodsRecordDTO extends AbstractTransDTO {
+
+ private Long id;
@ApiModelProperty(value = "用户ID")
private String userId;
@@ -46,4 +50,7 @@
private String status;
private String statusStr;
+
+ @ApiModelProperty(value = "到期时间")
+ private LocalDateTime expireTime;
}
--
Gitblit v1.9.3