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

gongzuming

2024-09-08 aa8652cc420f84bd3e543ebe611a563e852d4725

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

@@ -37,9 +37,15 @@
    @ApiModelProperty(value = "交易合计")
    private BigDecimal totalAmount;

    @ApiModelProperty(value = "质检扣款")
    @ApiModelProperty(value = "降级扣款")
    private BigDecimal checkFee;

    @ApiModelProperty(value = "缺货扣款")
    private BigDecimal lackFee;

    @ApiModelProperty(value = "补货扣款")
    private BigDecimal replaceFee;

    @ApiModelProperty(value = "集货站运费")
    private BigDecimal stationFee;