From 921f30c2112b68307d8b57b089dd582273df7ddb Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 20:16:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
index 0cda36b..54181bd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
@@ -72,6 +72,18 @@
     @ApiModelProperty(value = "用户电话")
     private String userMobile;
 
+    @ApiModelProperty(value="实收金额")
+    private BigDecimal realReceiveMoney;
+
+    @ApiModelProperty(value="已收金额")
+    private BigDecimal receiveMoney;
+
+    @ApiModelProperty(value="未收金额")
+    private BigDecimal unReceiveMoney;
+
+    @ApiModelProperty(value="支付方式1.全款2订金")
+    private Integer payType;
+
     @ApiModelProperty(value="结清标记0否1是")
     private Integer closeFlag;
 }

--
Gitblit v1.7.1