From 4ce5177289b1d34e467de9d8790836559cc5a09e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 18 十一月 2019 18:06:28 +0800
Subject: [PATCH] 合并了全部的代码

---
 ZigbeeApp/Shared/R.cs |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 60ad83f..4ad36c0 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -4990,7 +4990,15 @@
         /// <summary>
         /// 姝e湪涓婁紶澶囦唤鏂囦欢
         /// </summary>
-        public const int uBackupFileUploading = 15975;
+        public const int uBackupFileUploading = 15975;
+        /// <summary>
+        /// 纭鍒犻櫎鍏ㄩ儴娑堟伅?
+        /// </summary>
+        public const int uDeleteAllMessageMsg = 15976;
+        /// <summary>
+        /// 纭鏍囪鍏ㄩ儴娑堟伅涓哄凡璇�?
+        /// </summary>
+        public const int uUnTipAllMessageMsg = 15977;
 
         //鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙g殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
         /// <summary>

--
Gitblit v1.8.0