Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-28 af0266fa5570b6adcdb22f631bf13170e8646ca5

 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;