Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs

old mode 100755
new mode 100644
@@ -63,7 +63,7 @@
                    }

                    this.dicScenes[tempScene.Id] = tempScene;

                }

                catch(Exception ex)

                catch (Exception ex)

                {

                    HdlLogLogic.Current.WriteLog(ex);

                    try

@@ -755,8 +755,8 @@
                        sceneUIs.Add(this.dicScenes[sceneId]);

                    }

                }

            }

            
            }

            return sceneUIs;

        }