From b030378e316508eb5071aebe9d8494ad094f490f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 29 八月 2024 16:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java b/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
index 4421001..c694181 100644
--- a/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
+++ b/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
@@ -15,9 +15,6 @@
@ApiModelProperty(value = "商户ID")
private Long customerId;
- @ApiModelProperty(value = "兑换单号")
- private String recordNo;
-
@ApiModelProperty(value = "兑换码")
private String redeemCode;
@@ -37,14 +34,17 @@
private String pictures;
@ApiModelProperty(value = "兑换积分数")
- private String point;
+ private Integer point;
@ApiModelProperty(value = "兑换数量")
- private String num;
+ private Integer num;
@ApiModelProperty(value = "兑换总积分")
- private String totalPoint;
+ private Integer totalPoint;
- @ApiModelProperty(value = "兑换状态")
+ @ApiModelProperty(value = "兑换券状态POINT_GOODS_RECORD_STATUS")
private String status;
+
+ @ApiModelProperty(value = "绑定订单ID")
+ private String orderId;
}
--
Gitblit v1.9.3