Merge branch 'WJC' into temp-wxr

wxr

2021-03-16 9b44e30275621a48335fbea7b32b5065a2859c9c

 HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs

@@ -22,7 +22,7 @@
        /// </summary>
        void LoadMethod_AllElection()
        {
            btnChooseAll.MouseUpEventHandler += (sender, e) =>
            btnAllRoomText.MouseUpEventHandler += (sender, e) =>
            {
                btnChooseAll.IsSelected = !btnChooseAll.IsSelected;