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

huliguo

4 天以前 b646898adf3f2ad119dd9fd1c7c01d7f0742bf97

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

@@ -24,6 +24,10 @@
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalOrderMoney;

    @ApiModelProperty(value = "总订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalDepositMoney;

    @ApiModelProperty(value = "实收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal totalReceiveMoney;