From 2f38b2341e1572502fd6b4510670107f57ed261c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期五, 18 八月 2023 23:05:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
index 4eefe03..6682652 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java
@@ -21,16 +21,19 @@
private Long userId;
@ApiModelProperty(value = "用户名称")
- private String nickName;
+ private String realName;
@ApiModelProperty(value = "手机号码")
private String phonenumber;
- @ApiModelProperty("用户头像")
+ @ApiModelProperty(value="用户头像")
private String avatar;
- @ApiModelProperty("用户生日")
+ @ApiModelProperty(value="用户生日")
private String birthday;
+
+ @ApiModelProperty(value = "用户类型")
+ private String memberType;
@ApiModelProperty(value = "用户标签")
private String userTags;
@@ -55,6 +58,9 @@
private Date lastTaskTime;
@ApiModelProperty(value = "下次跟进任务时间")
+ private String nextTaskTime;
+
+ @ApiModelProperty(value = "最近消费时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date nextTaskTime;
+ private Date lastPayTime;
}
--
Gitblit v1.7.1