From 498557d0fd3b2bc14b446626cbc8a63a52fa83cb Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 04 九月 2024 12:56:02 +0800
Subject: [PATCH] Merge branch 'master' 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