Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 2c44da15d2ed01cefdc0d9e12497ebbd0ef2c8f9

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

@@ -27,6 +27,9 @@
    @ApiModelProperty(value = "基础售价")
    private BigDecimal sellingPrice;

    @ApiModelProperty(value = "积分")
    private Integer integral;

    @ApiModelProperty(value = "划线价")
    private BigDecimal originalPrice;
}