Merge branch 'WJC' into NewFilePath

wxr

2020-12-22 a56a485926a8927f904d7f4795c371c25b35753a

 HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs

@@ -38,7 +38,7 @@
        /// <summary>
        /// 子账号获得的当前住宅的功能数据
        /// </summary>
        public List<ShareData> CurResidenceShareDate = new List<ShareData>();
        public List<ShareData> CurResidenceShareData = new List<ShareData>();

        /// <summary>
        /// 
@@ -87,7 +87,7 @@
        /// <summary>
        /// 用户名字
        /// </summary>
        public string UserName = "";
        public string memberName = "";
        /// <summary>
        /// 
        /// </summary>