Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

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

@@ -39,6 +39,9 @@
    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;

    @ApiModelProperty(value = "支付方式1.全款2.订金")
    private Integer payType;

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