Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-04 79e82d188a24ad92395ac4b39c1a49266a647c3f

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

File was renamed from ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -18,7 +18,7 @@
    private List<OrderGoodsVO> goodsList;

    @ApiModelProperty(value = "使用积分")
    private BigDecimal point;
    private Integer point;

    @ApiModelProperty(value = "收货地址id")
    private Long addressId;
@@ -54,7 +54,7 @@
    private BigDecimal expressAmount;

    @ApiModelProperty(value = "可获得积分")
    private BigDecimal pointAmount;
    private Integer pointAmount;

    @ApiModelProperty(value = "实际支付价格")
    private BigDecimal paymentAmount;