Merge branch 'WJC' into NewFilePath

wxr

2020-12-21 ae9061e8e648af95393d96d6f5e59c434aed1558

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

old mode 100644
new mode 100755
@@ -40,7 +40,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = fan.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fan.GetRoomListName();
                fan.SaveFunctionData(true);
                //fan.SaveFunctionData(true);
            };
        }