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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceFreshAirRowControl.cs

@@ -10,14 +10,6 @@
    public class DeviceFreshAirRowControl : DeviceRowCommon
    {
        /// <summary>

        /// 分类界面的新风设备行控件

        /// </summary>

        /// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>
        public DeviceFreshAirRowControl(int i_ChidrenYaxis = 0) : base(i_ChidrenYaxis)
        {
        }

        /// <summary>

        /// 初始化控件

        /// </summary>

        /// <param name="i_device"></param>