Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs

@@ -31,7 +31,10 @@
        /// 当前选择模式
        /// </summary>
        public string currentKeySelectModeText = "";

        /// <summary>
        /// 当前选择的楼层ID
        /// </summary>
        public string currentSelectFloorId = string.Empty;
        /// <summary>
        /// 当前开关模式
        /// </summary>