From 272188e47087a8ef92eb0a48b122fa1c73ea94d3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 00:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
index 964e122..6233710 100644
--- a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
@@ -33,7 +33,7 @@
     /**
      * 商户ID
      */
-    private String customerId;
+    private Long customerId;
 
     /**
      * 状态(coupon_record_status)未使用、已使用、已过期
@@ -100,8 +100,14 @@
     private Integer point;
 
     /**
-     * 订单号
+     * 会员等级
      */
-    private String orderNo;
+    private Integer memberId;
+
+    /**
+     * 优惠券图片
+     */
+    private String imageUrl;
+
 
 }

--
Gitblit v1.9.3