Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

 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;
}