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

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Update/GatewayHistoryFirmwareVersionForm.cs

@@ -167,7 +167,7 @@
            rowlayout.ButtonClickEvent += (sender, e) =>

            {

                string gwID = HdlGatewayLogic.Current.GetGatewayId(upDatezbGateway);

                if (FirmwareUpdateResourse.dicGatewayUpdateList.ContainsKey(gwID) == true)

                if (FirmwareUpdateResourse.dicUpdateList.ContainsKey(gwID) == true)

                {

                    this.CloseForm();

                    return;