From 3fd5b6267e4468f179d1f339fee961b89cea7afa Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 23 七月 2023 18:46:58 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
index 9838ae5..be5a4a1 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
@@ -36,11 +36,14 @@
     private Integer buyNum;
 
     @ApiModelProperty(value = "优惠券id")
-    private Long memberCouponId;
+    private String memberCouponId;
 
     @ApiModelProperty(value = "商品售价")
     private BigDecimal goodsPrice;
 
+    @ApiModelProperty(value = "活动售价")
+    private BigDecimal activityPrice;
+
     @ApiModelProperty(value = "商品总价")
     private BigDecimal goodsTotalPrice;
 

--
Gitblit v1.7.1