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

xm

2020-05-07 c1de48884fa145a16a0f8bcee93274dcfaa0ff82

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

@@ -476,6 +476,10 @@
        /// <summary>

        /// Tip类型

        /// </summary>

        Tip = 4

        Tip = 4,

        /// <summary>

        /// 提醒类型

        /// </summary>

        Remind = 5

    }

}