1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 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