From 24e21f8ce1a28a78a58f9a95cc6438b4a9c737a6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 11:09:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/dto/response/report/OrderSupplierReportResultVO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderSupplierReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderSupplierReportResultVO.java
index baf5129..2414d2a 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderSupplierReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderSupplierReportResultVO.java
@@ -15,7 +15,7 @@
@ApiModelProperty("日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDateTime orderDate;
+ private LocalDateTime dateinfo;
@ApiModelProperty("供应商ID")
private String supplierId;
--
Gitblit v1.9.3