From 78676e7c2e4e06080a45fb6802bd32fd931cead3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 八月 2024 10:36:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java |   11 +++++++++++
 1 files changed, 11 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 decb469..2009d1c 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")
@@ -93,6 +95,11 @@
     @TableField("city_code")
     private String cityCode;
 
+
+    @ApiModelProperty(value = "备注")
+    @TableField("remark")
+    private String remark;
+
     @ApiModelProperty(value = "状态(1=正常,2=冻结,3=注销)")
     @TableField("status")
     private Integer status;
@@ -116,5 +123,9 @@
     @TableField(exist = false)
     private Long orderCount;
 
+    @ApiModelProperty("剩余天数")
+    @TableField(exist = false)
+    private Long lastDays;
+
 
 }

--
Gitblit v1.7.1