From 6d943721ed2c41de272450143d6e204e7c4bc446 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 13:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/entity/coupon/CouponTemplateDO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/coupon/CouponTemplateDO.java b/src/main/java/com/mzl/flower/entity/coupon/CouponTemplateDO.java
index 3360098..bd901cd 100644
--- a/src/main/java/com/mzl/flower/entity/coupon/CouponTemplateDO.java
+++ b/src/main/java/com/mzl/flower/entity/coupon/CouponTemplateDO.java
@@ -136,7 +136,7 @@
private Integer point;
@ApiModelProperty(value = "会员等级")
- private String vipGrade;
+ private Integer memberId;
}
--
Gitblit v1.9.3