Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into ma...

jiangqs

2023-08-26 09f319bc88cf80514491b19ce0290b41f9a1ba3a

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

@@ -31,6 +31,6 @@
    @ApiModelProperty(value = "未收金额")
    private BigDecimal unpaidMoney;

    @ApiModelProperty(value = "总订金")
    @ApiModelProperty(value = "订金")
    private BigDecimal receivableDeposit;
}