From 3dcbd186c42c598c0c08d1cd37034cf2baa09e54 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 30 十二月 2019 15:47:51 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/Common/Logic.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 4fe1ac6..42c01e0 100755
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -46,7 +46,7 @@
         /// <summary>
         /// 鎺ㄩ�佸唴瀹�
         /// </summary>
-        public string LogicCustomPushText;
+        public string LogicCustomPushText=string.Empty;
 
         //public Dictionary<string, string> TimeAttribute = new Dictionary<string, string>();
         public TimeAttributeObj TimeAttribute = new TimeAttributeObj();

--
Gitblit v1.8.0