From 87ca59fe207efa4bbd4029ca1d2ed38c11963682 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 九月 2024 14:56:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/dto/ExchangeDto.java | 15 ++++++++++++++-
1 files changed, 14 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..1e4b642 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,16 @@
@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;
+ @ApiModelProperty(hidden =true)
+ String title;
+
}
--
Gitblit v1.7.1