Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-12 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11

 HDL_ON/UI/UI1-Login/LoginPageBLL.cs

@@ -697,6 +697,7 @@
                //};
                OnAppConfig.Instance.LastLoginUserId = revertData.userId;
                OnAppConfig.Instance.SaveConfig();
                UserInfo.Current.ClearUserInfo();
                UserInfo.Current.userType = revertData.userType;
                UserInfo.Current.AccountString = account;
                //UserInfo.Current.password = password;