From b1bef8fac3c0553f87b7047673123b23b68daa49 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java b/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java
index 1341b16..260211a 100644
--- a/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java
@@ -77,7 +77,11 @@
@ApiModelProperty("总包干费")
private BigDecimal partnerTotalFeeAmount;
- @ApiModelProperty("销售扎数")
+
+ @ApiModelProperty("总销售扎数")
+ private Integer orderNum;
+
+ @ApiModelProperty("实际销售扎数")
private Integer realSaleNum;
@ApiModelProperty("利润")
--
Gitblit v1.9.3