Merge branch 'CJL' into NewFilePath

wxr

2020-12-14 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -497,7 +497,7 @@
                    {
                        Shared.Application.RunOnMainThread(() =>
                        {
                            DB_ResidenceData.Instance.CurrentRegion = UserInfo.Current.regionList[0];
                            DB_ResidenceData.Instance.SetCurrentRegion(0);
                            GetHomeGatewayList();
                            DB_ResidenceData.Instance.SaveResidenceData();
                            UserInfo.Current.SaveUserInfo();