合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

 ZigbeeApp/Shared/R.cs

@@ -550,6 +550,10 @@
        /// 时效性常开删除失败，继续“常开模式”请前往门锁用户界面设置
        /// </summary>
        public const int CancelLogicNormallyModeFailed2 = 309;
        /// <summary>
        /// 请输入合法的数字
        /// </summary>
        public const int IllegalNumber = 310;

        public readonly static int cancel = 5097;
        public readonly static int confrim = 5098;