From 617cac9aab814b33a4a0947d7222eae1098028ca Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期一, 28 十月 2024 16:33:52 +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/request/report/QueryPartnerOrderDTO.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java b/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java index 4dd1de4..79540e4 100644 --- a/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java +++ b/src/main/java/com/mzl/flower/dto/request/report/QueryPartnerOrderDTO.java @@ -27,4 +27,15 @@ @NotNull(message = "结束日期不能为空") private LocalDate paymentDateEnd; + + @ApiModelProperty(value = "开始时间",hidden = true) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime startDate; + + @ApiModelProperty(value = "结束时间",hidden = true) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime endDate; + } -- Gitblit v1.9.3