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

huliguo

2025-06-16 a966dafb8877552267a94fe8c544c5ea72cf5650

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