From d37e3682dbd6d8728243433d334c8e9f170983b2 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期三, 18 九月 2024 16:45:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java index 2009d1c..3639029 100644 --- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java +++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; +import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -78,6 +79,9 @@ @ApiModelProperty(value = "积分") @TableField("points") private Integer points; + @ApiModelProperty(value = "积分") + @TableField("first_add") + private Integer firstAdd; @ApiModelProperty(value = "省名称") @TableField("province") @@ -109,6 +113,9 @@ @ApiModelProperty(value = "最后一次登录时间") @TableField("last_login_time") private LocalDateTime lastLoginTime; + @ApiModelProperty(value = "邀请人id") + @TableField("invite_user_id") + private Long inviteUserId; @@ -119,6 +126,9 @@ @ApiModelProperty(value = "vip名称") @TableField(exist = false) private String vipName; + @ApiModelProperty(value = "归属地") + @TableField(exist = false) + private String place; @ApiModelProperty("累计充电数") @TableField(exist = false) private Long orderCount; -- Gitblit v1.7.1