From 1f5636d69332170ea3a41c76c9519f6ff6f0a8d9 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 28 十月 2019 15:40:30 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
old mode 100644
new mode 100755
index cd42244..24f7a45
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -7,7 +7,6 @@
public class ZbGatewayData : CommonDevice
{
#region 缃戝叧鍦ㄧ嚎鏍囪瘑
- [Newtonsoft.Json.JsonIgnore]
/// <summary>
/// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
/// </summary>
@@ -25,7 +24,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
@@ -72,7 +71,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
@@ -137,7 +136,7 @@
///<summary>
///utc鏃堕棿鎴筹紝绋嬪簭鍚姩鏃剁綉鍏崇殑绯荤粺鏃堕棿
///</summary>
- public int StartTime;
+ public long StartTime;
/// <summary>
///鍔犲叆灞�鍩熺綉妯″紡
///<para>0锛歸ifi杩炴帴灞�鍩熺綉</para>
@@ -165,7 +164,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
--
Gitblit v1.8.0