From 824edc826c92312c150a2f0eea9bdd2bfcb82b2f Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 14:28:37 +0800
Subject: [PATCH] 冲突
---
src/main/java/com/mzl/flower/entity/point/CustomerPoint.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/point/CustomerPoint.java b/src/main/java/com/mzl/flower/entity/point/CustomerPoint.java
index 75710eb..55f9510 100644
--- a/src/main/java/com/mzl/flower/entity/point/CustomerPoint.java
+++ b/src/main/java/com/mzl/flower/entity/point/CustomerPoint.java
@@ -12,18 +12,18 @@
@TableName("t_customer_point")
public class CustomerPoint extends BaseAutoEntity {
- @ApiModelProperty("名称")
+ @ApiModelProperty("用户ID")
private String userId;
- @ApiModelProperty("联系人")
+ @ApiModelProperty("商户ID")
private Long customerId;
@ApiModelProperty("总积分")
- private String totalPoint;
+ private Integer totalPoint;
@ApiModelProperty("使用积分")
- private String usedPoint;
+ private Integer usedPoint;
@ApiModelProperty("过期积分")
- private String expiredPoint;
+ private Integer expiredPoint;
}
--
Gitblit v1.9.3