From aa8652cc420f84bd3e543ebe611a563e852d4725 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期日, 08 九月 2024 16:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2

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

diff --git a/src/main/java/com/mzl/flower/entity/payment/Bill.java b/src/main/java/com/mzl/flower/entity/payment/Bill.java
index 1ab9565..6b12059 100644
--- a/src/main/java/com/mzl/flower/entity/payment/Bill.java
+++ b/src/main/java/com/mzl/flower/entity/payment/Bill.java
@@ -51,4 +51,6 @@
     @TableField("bill_date")
     private LocalDate billDate;//账单日期
 
+    @TableField("member_coupon_amount")
+    private BigDecimal memberCouponAmount;//优惠券金额
 }

--
Gitblit v1.9.3