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

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs

@@ -104,6 +104,8 @@
            rowData.frameTable.AddBottomLine();

            rowData.frameTable.ButtonClickEvent += (sender, e) =>

            {

                var form = new GatewayUploadAndDownLoadForm();

                form.AddForm(HdlGatewayLogic.Current.GetGatewayId(this.zbGateway));

            };



            //通用信息