From 31497bb69602433d94c8a28ea01c3ee3c7cc8576 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 24 十月 2019 14:32:30 +0800
Subject: [PATCH] 完全合并了Wjc，Xm 的 代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index e5f3084..24f7a45 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -24,7 +24,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
@@ -71,7 +71,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
@@ -136,7 +136,7 @@
///<summary>
///utc鏃堕棿鎴筹紝绋嬪簭鍚姩鏃剁綉鍏崇殑绯荤粺鏃堕棿
///</summary>
- public int StartTime;
+ public long StartTime;
/// <summary>
///鍔犲叆灞�鍩熺綉妯″紡
///<para>0锛歸ifi杩炴帴灞�鍩熺綉</para>
@@ -164,7 +164,7 @@
/// <summary>
/// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
/// </summary>
- public int AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
--
Gitblit v1.8.0