From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java | 6 +++---
1 files changed, 3 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..bc19ba0 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,8 @@
private Integer point;
/**
- * 订单号
+ * 会员等级
*/
- private String orderNo;
+ private Integer memberId;
}
--
Gitblit v1.9.3