Merge branch 'CJL-NEW'

wxr

2020-12-11 1bb8683aef25143048e572b65734de4772bfc712

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

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