From a8d2cb07f6440dc54dc4005b0b06d5a47cb1517d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:03 +0800
Subject: [PATCH] 12.16

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
index 5ef7a2b..a7914ca 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,6 +42,9 @@
     @ApiModelProperty(value = "用户")
     @TableField("name")
     private String name;
+    @ApiModelProperty("会员名称")
+    @TableField(exist = false)
+    private String vipName;
 
     @ApiModelProperty(value = "手机号")
     @TableField("phone")
@@ -68,6 +72,7 @@
 
     @ApiModelProperty(value = "添加时间")
     @TableField("create_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "删除(0=否,1=是)")
@@ -102,6 +107,9 @@
     @ApiModelProperty(value = "绑定门店名称")
     @TableField(exist = false)
     private String shopName;
+    @ApiModelProperty(value = "绑定门店列表")
+    @TableField(exist = false)
+    private List<String> shopNames;
     @ApiModelProperty(value = "绑定门店封面")
     @TableField(exist = false)
     private String shopCover;
@@ -247,6 +255,15 @@
     @TableField(exist = false)
     private Set<Integer> shopIds;
 
+    @ApiModelProperty(value = "降级预警")
+    @TableField("is_danger")
+    private Integer isDanger;
+
+    @ApiModelProperty(value = "最后下单时间")
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime lastOrderTime;
+
 
 
 

--
Gitblit v1.7.1