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

WJC

2019-10-29 8245dd3bba861d60556cd4804b39bca74c19c329

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameRowControl.cs

@@ -226,7 +226,7 @@
            this.rightIconSize = Application.GetMinRealAverage(i_width);

            if (chidrenYaxis != 0)

            {

                btnContr.Y += chidrenYaxis;

                btnContr.btnIcon.Y += chidrenYaxis;

            }



            return btnContr;