From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 b9ee078..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,8 +15,6 @@
@Data
public class MerTotalOrderVo {
- @ApiModelProperty(value = "是否代理商0否1是")
- private Integer agencyFlag;
@ApiModelProperty(value = "总订单数")
private Integer orderTotal;
@@ -27,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