From cb49d77f0b0a1a066790c65088864200f10e9462 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 28 七月 2023 19:55:39 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 ada646a..8c92c23 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
@@ -1,6 +1,5 @@
 package com.ruoyi.order.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +23,9 @@
 
     @ApiModelProperty(value = "用户姓名")
     private String userName;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
 
     @ApiModelProperty(value = "用户电话")
     private String userMobile;
@@ -52,6 +54,9 @@
     @ApiModelProperty(value="订单实际支付金额")
     private BigDecimal payMoney;
 
+    @ApiModelProperty(value="订单已收金额")
+    private BigDecimal receiveMoney;
+
     @ApiModelProperty(value="订单未支付金额")
     private BigDecimal unPaidMoney;
 

--
Gitblit v1.7.1