Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

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

@@ -1000,7 +1000,7 @@
            /// <summary>
            /// 设备所在网关的网关id
            /// </summary>
            public int GwId;
            public string GwId;
            /// <summary>
            /// 设备名
            /// </summary>