Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs

@@ -98,7 +98,7 @@
                //        {
                //            d.Add("on_off", "on");
                //        }
                //            fff = !fff;
                //        fff = !fff;
                //        DriverLayer.Control.Ins.SendWriteCommand(function, d);
                //        //System.Threading.Thread.Sleep(100);
                //    }