|
@@ -779,9 +779,11 @@ private FamilyInvitationService familyInvitationService;
|
|
|
if (p.getId().equals(userId) || (p.getShowToFamily() != null && p.getShowToFamily() == 1)) {
|
|
if (p.getId().equals(userId) || (p.getShowToFamily() != null && p.getShowToFamily() == 1)) {
|
|
|
FamilyMemberVO vo = new FamilyMemberVO();
|
|
FamilyMemberVO vo = new FamilyMemberVO();
|
|
|
vo.setId(p.getId());
|
|
vo.setId(p.getId());
|
|
|
|
|
+ vo.setMemberId(p.getId());
|
|
|
vo.setSource("parent");
|
|
vo.setSource("parent");
|
|
|
vo.setUserId(p.getId());
|
|
vo.setUserId(p.getId());
|
|
|
vo.setNickname(p.getNickname());
|
|
vo.setNickname(p.getNickname());
|
|
|
|
|
+ vo.setName(p.getNickname());
|
|
|
vo.setAvatar(p.getAvatar());
|
|
vo.setAvatar(p.getAvatar());
|
|
|
vo.setPhone(p.getPhone());
|
|
vo.setPhone(p.getPhone());
|
|
|
vo.setGender(p.getGender());
|
|
vo.setGender(p.getGender());
|