From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java | 17 +++++++++++++----
1 files changed, 13 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 606d60d..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
@@ -1,5 +1,6 @@
package com.ruoyi.member.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,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;
@@ -50,8 +54,13 @@
private String lastTaskContent;
@ApiModelProperty(value = "最近跟进任务时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastTaskTime;
@ApiModelProperty(value = "下次跟进任务时间")
- private Date nextTaskTime;
+ private String nextTaskTime;
+
+ @ApiModelProperty(value = "最近消费时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date lastPayTime;
}
--
Gitblit v1.7.1