From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +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 | 5 ++---
1 files changed, 2 insertions(+), 3 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 a60e10a..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,7 +21,7 @@
private Long userId;
@ApiModelProperty(value = "用户名称")
- private String nickName;
+ private String realName;
@ApiModelProperty(value = "手机号码")
private String phonenumber;
@@ -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