From f38160a365599318dae24eb2b9f07de8b78f7e1e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 11 十月 2024 08:41:04 +0800
Subject: [PATCH] Merge branch 'master-v2' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v2
---
src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java | 21 ++++++++++++++-------
1 files changed, 14 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..a0b2b6e 100644
--- a/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
+++ b/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
@@ -5,6 +5,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
@Data
@TableName("t_point_goods_record")
public class PointGoodsRecord extends BaseAutoEntity {
@@ -14,9 +17,6 @@
@ApiModelProperty(value = "商户ID")
private Long customerId;
-
- @ApiModelProperty(value = "兑换单号")
- private String recordNo;
@ApiModelProperty(value = "兑换码")
private String redeemCode;
@@ -37,14 +37,21 @@
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;
+
+
+ @ApiModelProperty(value = "到期时间")
+ private LocalDateTime expireTime;
}
--
Gitblit v1.9.3