Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "商品售价")
    private BigDecimal goodsPrice;

    @ApiModelProperty(value = "活动售价")
    private BigDecimal activityPrice;

    @ApiModelProperty(value = "商品总价")
    private BigDecimal goodsTotalPrice;