From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Common/Logic.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 42c01e0..879b843 100755
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -47,6 +47,10 @@
/// 鎺ㄩ�佸唴瀹�
/// </summary>
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