From 452d17b1c16bfe8585c16bd82e67450abd97c82f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 14 七月 2025 17:57:25 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberInfoVo.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 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 d86fa6f..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,15 +21,15 @@
     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 = "用户类型")
@@ -58,8 +58,7 @@
     private Date lastTaskTime;
 
     @ApiModelProperty(value = "下次跟进任务时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date nextTaskTime;
+    private String nextTaskTime;
 
     @ApiModelProperty(value = "最近消费时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

--
Gitblit v1.7.1