Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-02 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3

 src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java

@@ -64,6 +64,9 @@
    @ApiModelProperty(value = "售后退款")
    private BigDecimal salesFee;

    @ApiModelProperty(value = "售后数量")
    private Integer salesNum;

    @ApiModelProperty(value = "服务费率")
    private Double serviceFeeRate;