Merge branch 'CJL'

wxr

2020-11-23 135e148183e066795c487c62ef387ba40a621efd

 HDL_ON/UI/UI0-Public/AppUnlockPage.cs

@@ -9,7 +9,7 @@
    {
        void LoadOption()
        {
            if (MainPage.LoginUser == null)
            if ( UserInfo.Current == null)
            {
                return;
            }