From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java
index 9eb703e..e447fae 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java
@@ -20,12 +20,21 @@
     @ApiModelProperty(value = "购买用户id")
     private Long buyUserId;
 
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
     @ApiModelProperty(value = "购买列表")
-    List<AppBuyGoodsDto> appBuyGoodsDtoList;
+    private List<AppBuyGoodsDto> appBuyGoodsDtoList;
 
     @ApiModelProperty(value = "支付金额")
     private BigDecimal payMoney;
 
+    @ApiModelProperty(value = "改变金额")
+    private BigDecimal changeMoney;
+
     @ApiModelProperty(value = "支付方式")
     private Integer payType;
 

--
Gitblit v1.7.1