请合并最新版代码

xm

2020-06-19 ce1feeeb0aaa2e53bca4e8d64953edaba2b41106

 Home0618/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs

@@ -204,7 +204,7 @@
                return;

            }

            var tempZb = (ZbGateway)objValue;

            if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.zbGateway))

            if (tempZb.GwId != this.zbGateway.GwId)

            {

                //不是自己的网关推送，则不处理

                return;

@@ -363,7 +363,7 @@
                return;

            }

            var tempZb = (ZbGateway)objValue;

            if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.zbGateway))

            if (tempZb.GwId != this.zbGateway.GwId)

            {

                //不是自己的网关推送，则不处理

                return;