From a02bed07c8281ae0fda850921eb7443393c5fb0c Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期日, 29 十二月 2024 13:59:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4 --- src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java b/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java index b618424..4a9c405 100644 --- a/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java +++ b/src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java @@ -3,16 +3,16 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.time.LocalDate; +import java.time.LocalDateTime; @Data public class SupplierReportCalendarBO { @ApiModelProperty("下单的开始时间") - private LocalDate startDate; + private LocalDateTime startDate; @ApiModelProperty("下单的结束时间") - private LocalDate endDate; + private LocalDateTime endDate; @ApiModelProperty(value = "供应商id") private Long supplierId; -- Gitblit v1.9.3