From 9adfc0c5aa084bc61807ce43badf8b9f48b588c3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 05 九月 2024 17:16:16 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java b/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java
index 3bd0fae..e025402 100644
--- a/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java
+++ b/src/main/java/com/mzl/flower/entity/point/CustomerPointDetail.java
@@ -37,14 +37,8 @@
@ApiModelProperty("积分类型：增加（消费获取、活动获取、积分赠送），减少(积分扣减、积分兑换)")
private String type;
- @ApiModelProperty("积分（积分=使用积分+过期积分）")
+ @ApiModelProperty("积分变更数量")
private Integer point;
-
- @ApiModelProperty("使用积分")
- private Integer usePoint;
-
- @ApiModelProperty("过期积分")
- private Integer expiredPoint;
@ApiModelProperty("备注（可记录积分的来源或去向，如订单号、兑换内容、活动名称等）")
private String remarks;
--
Gitblit v1.9.3