Merge branch 'Dev-Branch' into wjc

wjc

2023-03-30 cae4d4b5b508a666fbd0dff3c2a981fdff841bc8

 HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs

@@ -13,6 +13,16 @@
        public ResidenceMemberInfo()
        {
        }
        /// <summary>
        /// 是否虚拟账号
        /// </summary>
        public bool isVirtualAccount
        {
            get
            {
                return string.IsNullOrEmpty(childAccountId);
            }
        }
        //public string Account = "";

        //public string UserName = "";
@@ -101,6 +111,10 @@
        /// </summary>
        public string memberHeadIcon;
        /// <summary>
        /// 人脸照片
        /// </summary>
        public string userFaceUrl;
        /// <summary>
        /// 用户账号
        /// 优先显示手机号，如果手机号为空则显示邮箱地址
        /// </summary>