From c67297af61ab9d897adae96f7e199c72c16d764b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 02 十二月 2024 18:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
index 831572b..63362a1 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -103,19 +103,19 @@
@ApiModelProperty(value = "合伙人积分数")
@TableField("part_point")
- private BigDecimal partPoint;
+ private Integer partPoint;
@ApiModelProperty(value = "合伙人培育积分数")
@TableField("part_grow_point")
- private BigDecimal partGrowPoint;
+ private Integer partGrowPoint;
@ApiModelProperty(value = "消费积分数")
@TableField("shop_point")
- private BigDecimal shopPoint;
+ private Integer shopPoint;
@ApiModelProperty(value = "返佣积分数")
@TableField("share_point")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "消费总金额")
@TableField("shop_amount")
@@ -124,6 +124,10 @@
@ApiModelProperty(value = "最后消费时间")
@TableField("last_shop_time")
private LocalDateTime lastShopTime;
+
+ @ApiModelProperty(value = "账户余额")
+ @TableField("balance")
+ private BigDecimal balance;
@ApiModelProperty(value = "可提现金额")
@TableField("withdrawable_amount")
@@ -145,9 +149,13 @@
@TableField("total_distribution_amount")
private BigDecimal totalDistributionAmount;
+ @ApiModelProperty(value = "账户余额")
+ @TableField("balance")
+ private BigDecimal balance;
+
@ApiModelProperty(value = "剩余积分")
@TableField("lave_point")
- private BigDecimal lavePoint;
+ private Integer lavePoint;
@ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
@TableField("change_promoter")
--
Gitblit v1.7.1