Merge branch 'dev-tzy' into temp-wxr

wxr

2021-03-16 fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4

 HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs

@@ -149,7 +149,7 @@
            };
            bodyView.AddChidren(sceneListView);

            foreach (var function in DB_ResidenceData.functionList.scenes)
            foreach (var function in FunctionList.List.scenes)
            {
                //var sbkScene = sbk_Devcie.number.Find((obj) => obj.sid == function.sid);
                //if (sbkScene != null)