From 8c469898c0a71224e17780696d47581de47c9ed7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 11:23:36 +0800
Subject: [PATCH] fix: 冲突
---
src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java | 3 +++
1 files changed, 3 insertions(+), 0 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 0839330..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
@@ -19,6 +19,9 @@
@ApiModelProperty("销售额")
private BigDecimal orderTotal;
+ @ApiModelProperty("销售合计（实付）")
+ private BigDecimal totalAmount;
+
@ApiModelProperty("花农底价")
private BigDecimal orderSupplierPriceAmount;
--
Gitblit v1.9.3