Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

3 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

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

@@ -53,4 +53,19 @@
    @ApiModelProperty(value="活动订单未付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  activityUnPayMoneyTotal;

    @ApiModelProperty(value="活动订单总数")
    private Integer thirdOrderTotal;

    @ApiModelProperty(value="活动订单金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  thirdOrderMoneyTotal;

    @ApiModelProperty(value="活动订单已付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  thirdPayMoneyTotal;

    @ApiModelProperty(value="活动订单未付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  thirdUnPayMoneyTotal;
}