From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerNewOrderDto.java |    5 ++++-
 1 files changed, 4 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 2416d5b..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
@@ -32,7 +32,10 @@
     @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