From 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <cuizf@fengyuntec.com> Date: 星期一, 02 九月 2024 20:18:52 +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