From 75ec232b4f96ddb3bf59482adb7ad26e573cd9b6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 八月 2024 09:48:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java
index 29456ee..b736df9 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java
@@ -3,6 +3,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class ExchangeDto {
     @ApiModelProperty("商品id")
@@ -26,5 +28,14 @@
     @ApiModelProperty("1微信2支付宝")
     Integer payMethod;
 
+    @ApiModelProperty(hidden =true)
+    BigDecimal orderPrice;
+    @ApiModelProperty(hidden =true)
+    BigDecimal payPrice;
+    @ApiModelProperty(hidden =true)
+    BigDecimal discountPrice;
+    @ApiModelProperty(hidden =true)
+    BigDecimal vipDiscount;
+
 
 }

--
Gitblit v1.7.1