From 80835bcc12f4788c1a88da61e623b362e57f1cb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 24 八月 2024 09:31:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 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 ced7611..3fdbadc 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
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -24,13 +26,15 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user")
@ApiModel(value="TAppUser对象", description="")
-public class TAppUser implements Serializable {
+public class TAppUser extends BasePojo {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId("id")
private Long id;
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "用户")
@TableField("name")
@@ -92,22 +96,40 @@
@TableField("city_code")
private String cityCode;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+
@ApiModelProperty(value = "状态（1=正常，2=冻结，3=注销）")
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
@ApiModelProperty(value = "最后一次登录时间")
@TableField("last_login_time")
private LocalDateTime lastLoginTime;
+ @ApiModelProperty(value = "邀请人id")
+ @TableField("invite_user_id")
+ private Long inviteUserId;
+
+
+
+
+ @ApiModelProperty(value = "标签名称")
+ @TableField(exist = false)
+ private String tagName;
+ @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