Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-14 488d430d2a5718d9296b68ccc39cc648cb3a1d1b

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

@@ -31,5 +31,8 @@
    @ApiModelProperty(value = "实际支付价格")
    private BigDecimal paymentAmount;

    @ApiModelProperty(value = "快递费")
    private BigDecimal expressAmount;


}