Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

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

@@ -25,9 +25,12 @@
    @ApiModelProperty(value = "实收金额")
    private BigDecimal relReceiveMoney;

    @ApiModelProperty(value = "实付金额")
    @ApiModelProperty(value = "已收金额")
    private BigDecimal relPayMoney;

    @ApiModelProperty(value = "未收金额")
    private BigDecimal unpaidMoney;

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