From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
index 06d6012..633c01b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
@@ -15,6 +15,7 @@
@Data
public class MerTotalOrderVo {
+
@ApiModelProperty(value = "总订单数")
private Integer orderTotal;
@@ -24,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;
}
--
Gitblit v1.7.1