From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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..a8123db 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,12 +3,14 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class ExchangeDto {
@ApiModelProperty("商品id")
Integer goodId;
@ApiModelProperty("地址id")
- Integer addressId;
+ Long addressId;
@ApiModelProperty("备注")
String remark;
@ApiModelProperty(hidden = true)
@@ -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