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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

 ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs

old mode 100755
new mode 100644
@@ -321,7 +321,7 @@
            functionSceneBodyView.Height = functionSceneAutoBodyView.Height - roomSwitchContr.Bottom;

            functionSceneAutoBodyView.AddChidren(functionSceneBodyView);



            //执行初始化 
            //执行初始化

            roomSwitchContr.InitControl();

        }