Merge remote-tracking branch 'origin/wjc' into Dev-Wxr

wxr

2023-04-11 87bc1140ac4a1dc3e46a322444a80a9ce321b57d

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs

@@ -82,7 +82,7 @@
                {
                    try
                    {
                        userList = Send.GetResidenceMemberAccount();
                        userList = Send.Current.GetResidenceMemberAccount();

                    }
                    catch { }