Merge branch 'CJL-NEW'

wxr

2020-12-09 d60b92c58ac09197642eb6dac9b905f0898dacb8

 HDL_ON/UI/UI0-Public/AppUnlockPage.cs

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