Merge branch 'Dev-Branch' into Dev-Wxr-1.8.1

wxr

2023-07-17 59d9f0ad6dc40b079fa1f8f514698429ead04a75

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -12,6 +12,7 @@
        {
            LoadEvent_ChangeFunctionName ();
            SkipChooseRoomPage();

        }

        /// <summary>
@@ -77,5 +78,8 @@
            }
                
        }
        


    }
}