From 1d4473f81abe4ef200f23b781756a7da689dc718 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 16:49:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 22 ++++++++++++++++++++++
1 files changed, 22 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..1824fcd 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 HH:mm:ss")
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,20 @@
@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;
+
+
+ public String getIdStr(){
+ return String.valueOf(id);
+ }
+
--
Gitblit v1.7.1