From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Common/Logic.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/Logic.cs b/ZigbeeApp/Shared/Common/Logic.cs
index 4fe1ac6..1bc61e4 100755
--- a/ZigbeeApp/Shared/Common/Logic.cs
+++ b/ZigbeeApp/Shared/Common/Logic.cs
@@ -17,7 +17,7 @@
/// </summary>
public int Result;
/// <summary>
- /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�
+ /// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.闂ㄩ攣甯稿紑.鍏�;
/// </summary>
public int LogicType = 0;
/// <summary>
@@ -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