From 559ee10df3622e4802ca5664b83b713cd3a75f97 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 25 十一月 2024 11:42:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 0837295..3e54505 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
@@ -82,9 +82,9 @@
@TableField("invite_user_id")
private Long inviteUserId;
- @ApiModelProperty(value = "拥有门店id")
+ @ApiModelProperty(value = "绑定门店id")
@TableField("shop_id")
- private Integer shopId;
+ private Long shopId;
@ApiModelProperty(value = "合伙人积分数")
@TableField("part_point")
@@ -110,5 +110,24 @@
@TableField("last_shop_time")
private LocalDateTime lastShopTime;
+ @ApiModelProperty(value = "可提现金额")
+ @TableField("withdrawable_amount")
+ private BigDecimal withdrawal_amount;
+
+ @ApiModelProperty(value = "已提现金额")
+ @TableField("withdrawn_amount")
+ private BigDecimal withdrawn_amount;
+
+ @ApiModelProperty(value = "充值总金额")
+ @TableField("total_recharge_amount")
+ private BigDecimal total_recharge_amount;
+
+ @ApiModelProperty(value = "红包总金额")
+ @TableField("total_red_packet_amount")
+ private BigDecimal total_red_packet_amount;
+
+ @ApiModelProperty(value = "分销总金额")
+ @TableField("total_distribution_amount")
+ private BigDecimal total_distribution_amount;
}
--
Gitblit v1.7.1