Merge branch 'WJC' into wxr7

wxr

2021-10-21 475ccc9f21022ce66981effcedf8de339fc98a2f

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

@@ -527,7 +527,7 @@
            }
            if (fanState != null)
            {
                sceneFunctionInfo += tempState.GetValueText();
                sceneFunctionInfo += fanState.GetValueText();
            }
            var briState = sceneFunction.status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
            if (briState != null)