Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 in...

cloudroam

2024-12-10 57a283d06cba1fd3a6b78af590a97372774bbca6

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

@@ -73,6 +73,15 @@
    @ApiModelProperty("实际销售扎数")
    private Integer realSaleNum;

    @ApiModelProperty("缺货扎数")
    private BigDecimal orderLackNum;

    @ApiModelProperty("降级扎数")
    private BigDecimal orderReduceNum;

    @ApiModelProperty("补货扎数")
    private BigDecimal orderReplaceNum;

    @ApiModelProperty("利润--总包干费没有无法计算")
    private BigDecimal profitFeeAmount;