From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index 28a173c..f049bc2 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -80,14 +80,43 @@
/// </summary>
public string createTime;
/// <summary>
- /// 鐢ㄦ埛璐﹀彿
- /// </summary>
- public string Account = "";
- /// <summary>
/// 鐢ㄦ埛鍚嶅瓧
/// </summary>
public string UserName = "";
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountEmail;
+ /// <summary>
+ ///
+ /// </summary>
+ public string childAccountPhone;
+ /// <summary>
+ /// 鐢ㄦ埛璐﹀彿
+ /// 浼樺厛鏄剧ず鎵嬫満鍙凤紝濡傛灉鎵嬫満鍙蜂负绌哄垯鏄剧ず閭鍦板潃
+ /// </summary>
+ public string Account
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(childAccountPhone))
+ {
+ return childAccountPhone;
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(childAccountEmail))
+ {
+ return childAccountEmail;
+ }
+ else
+ {
+ return "";
+ }
+ }
+ }
+ }
}
public class ShareData
--
Gitblit v1.8.0