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

gongzuming

2024-09-20 35309b932b738d5a8537e53207d28004a8da0f89

 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;