Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

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

File was renamed from ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -1,4 +1,4 @@
package com.ruoyi.order.vo;
package vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -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;