Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs

@@ -327,7 +327,7 @@
                items.Add("60", "1min");
                items.Add("120", "2min");
                items.Add("300", "5min");
                new PublicAssmebly().SetSceneDelayDialog(items,action,sceneFunction.delay);
                new PublicAssmebly().SetSceneDelayDialog(action, sceneFunction.delay);
            };
            #endregion