Merge branch 'CJL-NEW'

wxr

2020-12-06 6b8177fe424b661687e9fb8119f990c05b054f2b

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -26,7 +26,7 @@
                    {
                        new Tip()
                        {
                            CloseTime = 3,
                            CloseTime = 1,
                            Text = Language.StringByID(StringId.DeviceNameCannotBeEmpty),
                            Direction = AMPopTipDirection.None,
                        }.Show(bodyView);