From d390d8f502436eaa17ee8ca7abd3c3f8a11a8514 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 12 十月 2024 13:43:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/entity/payment/OrderItem.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/entity/payment/OrderItem.java b/src/main/java/com/mzl/flower/entity/payment/OrderItem.java
index 84c559f..fa2bdd7 100644
--- a/src/main/java/com/mzl/flower/entity/payment/OrderItem.java
+++ b/src/main/java/com/mzl/flower/entity/payment/OrderItem.java
@@ -93,4 +93,10 @@
     @TableField("real_price")
     private BigDecimal realPrice;//真实成交价格/每扎
 
+    @TableField("coupon_amount_total")
+    private BigDecimal couponAmountTotal;//优惠券总金额
+
+    @TableField("real_total")
+    private BigDecimal realTotal;//真实成交总价格
+
 }

--
Gitblit v1.9.3