Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs

@@ -32,8 +32,8 @@
        /// </summary>
        public int DelayTime = 0;
        /// <summary>
        /// 当Type=2时存在

        /// 延时执行序号，表示第几个延时动作

        /// 当Type=2时存在
        /// 延时执行序号，表示第几个延时动作
        /// </summary>
        public int DelayTimeSerialNumber = 0;

@@ -179,7 +179,6 @@
                }
                return $"{tempareture},{model},{wind}";
            }

            else
            {
                return null;