Merge remote-tracking branch 'origin/master'

mitao

2024-03-06 51527a6e817a6ba73b29b07e94a7e879a86f8eaf

 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;