Merge branch 'CJL' into NewFilePath

wxr

2020-12-14 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139

 HDL_ON/Entity/DB_ResidenceData.cs

@@ -7,6 +7,7 @@

namespace HDL_ON.Entity
{
    [System.Serializable]
    public class DB_ResidenceData
    {
        public DB_ResidenceData()
@@ -18,7 +19,8 @@
        /// </summary>
        public string MasterToken;

        RegionInfoRes _residecenInfo;
        //RegionInfoRes _residecenInfo;
        RegionInfoRes _residecenInfo = new RegionInfoRes();
        /// <summary>
        /// 住宅基础信息
        /// </summary>
@@ -47,10 +49,11 @@
                    return _residecenInfo;
                }
            }
            set
            {
                _residecenInfo = value;
            }
        }

        public void SetCurrentRegion(int index)
        {
            _residecenInfo = UserInfo.Current.regionList[index];
        }

        ///// <summary>