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/dto/MerNewOrderDto.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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..90d6147 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,13 +20,22 @@
@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 = "支付方式")
+ @ApiModelProperty(value = "改变金额")
+ private BigDecimal changeMoney;
+
+ @ApiModelProperty(value = "支付方式1微信2现金3支付宝")
private Integer payType;
@ApiModelProperty(value = "订单备注")
--
Gitblit v1.7.1