From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Common/Logic.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 4fe1ac6..879b843 100755
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -46,7 +46,11 @@
/// <summary>
/// 鎺ㄩ�佸唴瀹�
/// </summary>
- public string LogicCustomPushText;
+ public string LogicCustomPushText=string.Empty;
+ /// <summary>
+ /// 璁板綍鎺ㄩ�佸紑鍏崇姸鎬�
+ /// </summary>
+ public int LogicIsCustomPushText = 0;
//public Dictionary<string, string> TimeAttribute = new Dictionary<string, string>();
public TimeAttributeObj TimeAttribute = new TimeAttributeObj();
--
Gitblit v1.8.0