From 466b7ae4a0b12089d716030b024c8dcd0b29b02f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:03:06 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 21 +++++++++++++++++++++
1 files changed, 21 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 0a731d5..e11a395 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;
/**
@@ -32,6 +33,8 @@
@ApiModelProperty(value = "主键")
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "用户")
@TableField("name")
@@ -76,6 +79,9 @@
@ApiModelProperty(value = "积分")
@TableField("points")
private Integer points;
+ @ApiModelProperty(value = "积分")
+ @TableField("first_add")
+ private Integer firstAdd;
@ApiModelProperty(value = "省名称")
@TableField("province")
@@ -93,6 +99,11 @@
@TableField("city_code")
private String cityCode;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+
@ApiModelProperty(value = "状态（1=正常，2=冻结，3=注销）")
@TableField("status")
private Integer status;
@@ -102,6 +113,9 @@
@ApiModelProperty(value = "最后一次登录时间")
@TableField("last_login_time")
private LocalDateTime lastLoginTime;
+ @ApiModelProperty(value = "邀请人id")
+ @TableField("invite_user_id")
+ private Long inviteUserId;
@@ -112,6 +126,13 @@
@ApiModelProperty(value = "vip名称")
@TableField(exist = false)
private String vipName;
+ @ApiModelProperty("累计充电数")
+ @TableField(exist = false)
+ private Long orderCount;
+
+ @ApiModelProperty("剩余天数")
+ @TableField(exist = false)
+ private Long lastDays;
}
--
Gitblit v1.7.1