From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

---
 ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
old mode 100755
new mode 100644
index c45a493..422459f
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Config.cs
@@ -173,7 +173,10 @@
                 return (DateTime.Now - LoginDateTime).Days < 7;
             }
         }
-
+        /// <summary>
+        ///鏆傛椂榛樿
+        /// </summary>
+        public string Nmae = string.Empty;
         /// <summary>
         /// 璐︽埛鐧诲綍鎴愬姛鐨勮处鎴风被鍨�
         /// </summary>

--
Gitblit v1.8.0