Merge remote-tracking branch 'origin/master-v5' into master-v5

陶杰

2024-12-06 984c102eb4e632985e45b7c4be1545c53c87b589

 src/main/java/com/mzl/flower/dto/response/report/OrderReportResultVO.java

@@ -67,6 +67,9 @@
    @ApiModelProperty("总包干费--暂无")
    private BigDecimal partnerTotalFeeAmount;

    @ApiModelProperty("总销售扎数")
    private Integer orderNum;

    @ApiModelProperty("实际销售扎数")
    private Integer realSaleNum;