From 84f1e606d3cdd3733b0e92927bd46bf60ad93063 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 30 八月 2024 11:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/entity/menber/Member.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/entity/menber/Member.java b/src/main/java/com/mzl/flower/entity/menber/Member.java
index 66b602c..6d7de0f 100644
--- a/src/main/java/com/mzl/flower/entity/menber/Member.java
+++ b/src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -5,6 +5,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
@@ -28,7 +29,7 @@
     private int endPoint;
 
     @ApiModelProperty("会员折扣类型（百分比、固定金额）")
-    private int discountType;
+    private String discountType;
 
     @ApiModelProperty("会员折扣百分比")
     private BigDecimal discountRatio;

--
Gitblit v1.9.3