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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/GatewayBackupEnum.cs

@@ -56,6 +56,14 @@
        /// <summary>

        /// 简约面板震动功能

        /// </summary>

        A简约面板震动功能 = 12

        A简约面板震动功能 = 12,

        /// <summary>

        /// 空调摆风功能

        /// </summary>

        A空调摆风功能 = 13,

        /// <summary>

        /// 面板接近感应功能

        /// </summary>

        A面板接近感应功能 = 14,

    }

}