From f6fad9857bddebb5bfaad2074e4be73b9b5abc62 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 04 Dec 2023 17:34:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jc' into jc
---
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