Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 8ca8432f7dfb2c58ff6c0f9d1f7224b262bdaba4

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java

@@ -62,4 +62,7 @@
    @ApiModelProperty(value = "实际支付价格")
    private BigDecimal paymentAmount;

    @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
    private Integer distributionMode;

}