Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs

@@ -184,6 +184,7 @@
                    info.Name = data.Name;

                    info.HardwareVersion = hardCode;

                    info.ImagType = imgType;

                    info.CreatedOnUtc = data.CreatedOnUtc;

                    imgTypeInfo.listVeison.Add(info);

                    //固件的信息处理

                    DoAdjustFirmwareInformation(info, data.Remarks);