Merge branch 'CJL' into NewFilePath

wxr

2020-12-14 55bd5c4ccb56cbd3c10e6b170aaab20d7023c139

 HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs

@@ -56,7 +56,6 @@
            {
                btnFunctionName.Text = btnFunctionName_Out.Text = aC.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = aC.GetRoomListName();
                aC.SaveFunctionData(true);
            };
        }