Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c

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