From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java
index d81b7c9..01f5b32 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/UserPointVO.java
@@ -1,11 +1,8 @@
package com.ruoyi.account.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.math.BigDecimal;
@Data
@ApiModel(value="UserPoint对象", description="")
@@ -15,17 +12,17 @@
private Integer totalPoint;
@ApiModelProperty(value = "消费积分数")
- private BigDecimal shopPoint;
+ private Integer shopPoint;
@ApiModelProperty(value = "返佣积分数")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "拉新积分")
- private BigDecimal pullNewPoint;
+ private Integer pullNewPoint;
@ApiModelProperty(value = "门店业绩积分")
- private BigDecimal shopAchievementPoint;
+ private Integer shopAchievementPoint;
@ApiModelProperty(value = "门店返佣积分")
- private BigDecimal shopSharePoint;
+ private Integer shopSharePoint;
}
--
Gitblit v1.7.1