From 57a283d06cba1fd3a6b78af590a97372774bbca6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 10 十二月 2024 15:45:03 +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 |    9 +++++++++
 1 files changed, 9 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 4fffd79..7c82985 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
@@ -73,6 +73,15 @@
     @ApiModelProperty("实际销售扎数")
     private Integer realSaleNum;
 
+    @ApiModelProperty("缺货扎数")
+    private BigDecimal orderLackNum;
+
+    @ApiModelProperty("降级扎数")
+    private BigDecimal orderReduceNum;
+
+    @ApiModelProperty("补货扎数")
+    private BigDecimal orderReplaceNum;
+
     @ApiModelProperty("利润--总包干费没有无法计算")
     private BigDecimal profitFeeAmount;
 

--
Gitblit v1.9.3