From 93c64d57fa870193d4971509d0a20c3be8779565 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 22 八月 2024 16:44:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java |   19 +++++++++++++++++++
 1 files changed, 19 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 0bfa1c3..0cfdd15 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
@@ -32,6 +32,8 @@
     @ApiModelProperty(value = "主键")
     @TableId("id")
     private Long id;
+    @TableField(exist = false)
+    private String uid;
 
     @ApiModelProperty(value = "用户")
     @TableField("name")
@@ -104,4 +106,21 @@
     private LocalDateTime lastLoginTime;
 
 
+
+
+    @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