Merge branch 'dev-tzy' into NewFilePath

wxr

2021-02-01 1dade03e0e71076af3a3de1bf10ba6cad61ac216

 HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs

@@ -38,7 +38,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = socketFunction.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = socketFunction.GetRoomListName();
                socketFunction.SaveFunctionData(true);
                socketFunction.UpdataFuncitonInfo();
            };
        }