From bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 19 四月 2021 09:36:40 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr
---
HDL_ON/DAL/Server/NewApiRes.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index c522247..c23dac9 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -544,38 +544,38 @@
/// <summary>
/// 缃戝叧ID
/// </summary>
- public string gatewayId;
+ public string gatewayId ="";
/// <summary>
/// 缃戝叧snID
/// </summary>
- public string sn;
+ public string sn = "";
/// <summary>
///
/// </summary>
- public string aesKey;
+ public string aesKey = "";
/// <summary>
/// BUSUDPGATEWAY,
/// AGATEWAY,
/// ZIGBEEGATEWAY,
/// KNXGATEWAY
/// </summary>
- public string gatewayType;
+ public string gatewayType = "";
/// <summary>
/// 浣忓畢ID
/// </summary>
- public string homeId;
+ public string homeId = "";
/// <summary>
///
/// </summary>
- public string mac;
+ public string mac = "";
/// <summary>
///
/// </summary>
- public string primaryKey;
+ public string primaryKey = "";
/// <summary>
///
/// </summary>
- public string encryptionType;
+ public string encryptionType = "";
/// <summary>
/// 瀛愮綉鍙�
@@ -1434,6 +1434,11 @@
/// 淇℃伅绫诲瀷
/// </summary>
public string messageType = "";
+ /// <summary>
+ /// 鎵╁睍鏁版嵁鍐呭
+ /// </summary>
+ public string expantContent = "";
+
}
@@ -1466,6 +1471,23 @@
public string messageType;
}
+ /// <summary>
+ /// 钀ょ煶浜戝瓙璐﹀彿token
+ /// </summary>
+ [System.Serializable]
+ public class EZChildAccessToken
+ {
+ /// <summary>
+ /// token
+ /// </summary>
+ public string accessToken;
+ /// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public string expireTime;
+ }
+
+
//#region 鏃ф帴鍙�
///// <summary>
/////
--
Gitblit v1.8.0