Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

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

@@ -40,6 +40,7 @@
            actionRefresh = () => {
                btnFunctionName.Text = btnFunctionName_Out.Text = fan.name;
                btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fan.GetRoomListName();
                fan.SaveFunctionData();
            };
        }