Merge branch 'wjc' into Dev-1.9

wxr

2023-07-19 fd0bbcd6e475754d88cedb798000ebeb375d07e4

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

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

        }

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


    }
}