Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代

wxr

2024-10-14 b847c06d8617efb2cbbad6f11b0344b779138e92

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

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

        }

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


    }
}