Merge branch 'wxr6' into temp-wxr

wxr

2021-06-23 197faa202beea7bc6723b24d3bc1de2d5fa48844

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -37,7 +37,7 @@
                    {
                        function.name = name;
                        btnFunctionName.Text = name;
                        function.SaveFunctionData(true);
                        function.UpdataFuncitonInfo();
                    }
                };
                new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>());