From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
index 8c1a5d2..003bdb2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
@@ -48,11 +48,12 @@
     @ApiModelProperty(value = "优惠券抵扣")
     private BigDecimal couponDiscount;
 
-    @ApiModelProperty(value="应收金额")
-    private BigDecimal receivableMoney;
 
     @ApiModelProperty(value="应收订金")
     private BigDecimal receivableDeposit;
+
+    @ApiModelProperty(value="应收全额")
+    private BigDecimal receivableMoney;
 
     @ApiModelProperty(value="订单实际支付金额")
     private BigDecimal payMoney;
@@ -60,6 +61,9 @@
     @ApiModelProperty(value="订单已收金额")
     private BigDecimal receiveMoney;
 
+    @ApiModelProperty(value = "实收金额")
+    private BigDecimal relReceiveMoney;
+
     @ApiModelProperty(value="订单未支付金额")
     private BigDecimal unPaidMoney;
 

--
Gitblit v1.7.1