From 1edcf19be5f339219210894c45a77d9d507b2586 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 三月 2023 18:19:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
index 554d3e8..cb335b2 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
@@ -53,6 +53,8 @@
     private Double discount;
     @ApiModelProperty("折扣金额")
     private Double discountAmount;
+    @ApiModelProperty("优惠券id")
+    private Integer couponId;
     @ApiModelProperty("优惠券金额")
     private Double discountedPrice;
     @ApiModelProperty("当前余额")

--
Gitblit v1.7.1