Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-12 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11

 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);
            };
        }