From 798ab07db6464f24e353dcdf8397506ab246c91d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 09:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/friend/vo/FriendVO.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/friend/vo/FriendVO.java b/src/main/java/org/springblade/modules/friend/vo/FriendVO.java
index f2c8dd1..0e7d502 100644
--- a/src/main/java/org/springblade/modules/friend/vo/FriendVO.java
+++ b/src/main/java/org/springblade/modules/friend/vo/FriendVO.java
@@ -14,6 +14,8 @@
 public class FriendVO extends Friend {
 	private static final long serialVersionUID = 1L;
 
-	private String startTime;
-	private String endTime;
+	private String realName;
+	private String phone;
+	private String avatar;
+	private String friendid;
 }

--
Gitblit v1.9.3