bug

jiangqs

2023-08-31 dbff53150cdc807faa56c0d1a947d24b69f372b9

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

@@ -48,11 +48,12 @@
    @ApiModelProperty(value = "优惠券抵扣")
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应收金额")
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    private BigDecimal receivableDeposit;

    @ApiModelProperty(value="应收全额")
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="订单实际支付金额")
    private BigDecimal payMoney;
@@ -60,6 +61,9 @@
    @ApiModelProperty(value="订单已收金额")
    private BigDecimal receiveMoney;

    @ApiModelProperty(value = "实收金额")
    private BigDecimal relReceiveMoney;

    @ApiModelProperty(value="订单未支付金额")
    private BigDecimal unPaidMoney;