Merge branch 'CJL-NEW'

wxr

2020-12-09 d60b92c58ac09197642eb6dac9b905f0898dacb8

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -35,7 +35,7 @@

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