From 0f148ab371926582eeb2774904af5de6dc9e5761 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 16:32:42 +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/response/report/OrderReportResultVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
index 6564b6e..290900a 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java
@@ -13,12 +13,15 @@
@ApiModelProperty("下单日期")
@JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
- @DateTimeFormat
+ @DateTimeFormat(pattern="yyyy-MM-dd")
private LocalDateTime orderDate;
@ApiModelProperty("销售额")
private BigDecimal orderTotal;
+ @ApiModelProperty("销售合计（实付）")
+ private BigDecimal totalAmount;
+
@ApiModelProperty("花农底价")
private BigDecimal orderSupplierPriceAmount;
--
Gitblit v1.9.3