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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

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

@@ -25,9 +25,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;