From f38160a365599318dae24eb2b9f07de8b78f7e1e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 08:41:04 +0800
Subject: [PATCH] Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v2
---
src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java b/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java
index 1c92bde..1d27807 100644
--- a/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/point/QueryPointDetailDTO.java
@@ -4,6 +4,7 @@
import lombok.Data;
import java.time.LocalDate;
+import java.time.LocalDateTime;
@Data
public class QueryPointDetailDTO {
@@ -12,10 +13,10 @@
private Long customerId;
@ApiModelProperty("记录日期")
- private LocalDate recordDateStart;
+ private String recordDateStart;
@ApiModelProperty("记录日期")
- private LocalDate recordDateEnd;
+ private String recordDateEnd;
@ApiModelProperty("积分类型-point_type")
private String type;
@@ -25,4 +26,17 @@
@ApiModelProperty(hidden = true)
private String userId;
+
+ @ApiModelProperty("yyyy-MM-dd HH:mm:ss")
+ private String createTimeStartStr;
+
+ @ApiModelProperty("yyyy-MM-dd HH:mm:ss")
+ private String createTimeEndStr;
+
+
+ @ApiModelProperty(hidden = true)
+ private LocalDateTime createTimeStart;
+
+ @ApiModelProperty(hidden = true)
+ private LocalDateTime createTimeEnd;
}
--
Gitblit v1.9.3