From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏
---
HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs | 118 ++++++++++------------------------------------------------
1 files changed, 21 insertions(+), 97 deletions(-)
diff --git a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
index e55a923..7028c70 100644
--- a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
+++ b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -54,24 +54,20 @@
/// <summary>
/// 浣忓畢ID
/// </summary>
- public string RegionID { get; set; }
+ public string id { get; set; }
/// <summary>
/// 浣忓畢鍚嶇О
/// </summary>
- public string Name { get; set; }
+ public string homeName { get; set; }
/// <summary>
/// 浣忓畢鍦板潃
/// </summary>
- public string Address { get; set; }
+ public string homeAddress { get; set; }
/// <summary>
/// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
/// </summary>
- public bool IsOthreShare = false;
- /// <summary>
- ///
- /// </summary>
- public List<HomeGateways> homeGateways = new List<HomeGateways>();
-
+ public bool isOtherShare { get; set; }
+
//2020-11-13 鏂板
/// <summary>
/// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛�
@@ -81,7 +77,7 @@
/// <summary>
/// 鏄惁鏀寔杩滅▼
/// </summary>
- public bool isRemoteControl;
+ public bool isRemoteControl;//??
/// <summary>
/// 缁忓害
/// </summary>
@@ -99,15 +95,11 @@
/// </summary>
public string homeType;
/// <summary>
- ///
- /// </summary>
- public string createonutc;
- /// <summary>
/// 鍖哄煙鏈嶅姟鍣�
/// </summary>
public string regionUrl;
/// <summary>
- /// 鍖哄煙鏈嶅姟鍣�
+ /// emq鏈嶅姟鍣�
/// </summary>
public string emqUrl;
/// <summary>
@@ -115,89 +107,21 @@
/// </summary>
public string homeRegionId;
/// <summary>
- /// 浣忓畢鍖哄煙鍚嶅瓧
+ /// 鏄惁鍏佽鍒涘缓鍦烘櫙
/// </summary>
- public string homeRegionName;
- ///// <summary>
- ///// 鏄惁缁戝畾缃戝叧
- ///// </summary>
- //public bool isBindGateway;
+ public bool isAllowCreateScene;//??
+ /// <summary>
+ /// 鏄惁缁戝畾缃戝叧
+ /// </summary>
+ public bool isBindGateway;
+ /// <summary>
+ /// 璋冭瘯浜哄憳ID
+ /// </summary>
+ public string debugStaffUserId;
+ /// <summary>
+ /// 璋冭瘯鏉冮檺鏄惁鎵撳紑
+ /// </summary>
+ public bool debugPerm;
}
- /// <summary>
- /// 鏂颁簯绔綇瀹呭垪琛ㄨ繑鍥炲瓧娈�
- /// </summary>
- [Serializable]
- public class RegionInfoResNew
- {
- /// <summary>
- /// 浣忓畢ID
- /// </summary>
- public string Id;
- /// <summary>
- /// 浣忓畢鍚嶅瓧
- /// </summary>
- public string homeName;
- /// <summary>
- /// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
- /// </summary>
- public bool IsOtherShare;
- /// <summary>
- /// 浠呭瓙璐﹀彿鐧婚檰鐨勬椂鍊欎娇鐢�,褰撱�怚sOthreShare銆戜负"true"锛�
- /// 瀛愯处鎴风被鍨� 1.ORDINARY 2.DEBUG 3.ADMIN
- /// </summary>
- public string accountType;
- /// <summary>
- /// 鏄惁鏀寔杩滅▼
- /// </summary>
- public bool isRemoteControl;
- /// <summary>
- /// 浣忓畢绌洪棿缁撴瀯Id
- /// </summary>
- public string structId;
- /// <summary>
- /// 缁忓害
- /// </summary>
- public double longitude;
- /// <summary>
- /// 绾害
- /// </summary>
- public double latitude;
- /// <summary>
- /// 浜や粯鐘舵��
- /// </summary>
- public string deliverstatus;
- /// <summary>
- /// 浣忓畢绫诲瀷 Zigbee, Buspro, A
- /// </summary>
- public string homeType;
- /// <summary>
- ///
- /// </summary>
- public string createonutc;
- /// <summary>
- /// 鍖哄煙鏈嶅姟鍣�
- /// </summary>
- public string regionUrl;
- /// <summary>
- /// 鍖哄煙鏈嶅姟鍣�
- /// </summary>
- public string emqUrl;
- /// <summary>
- /// 浣忓畢鍖哄煙Id
- /// </summary>
- public string homeRegionId;
- /// <summary>
- /// 浣忓畢鍖哄煙鍚嶅瓧
- /// </summary>
- public string homeRegionName;
- ///// <summary>
- ///// 鏄惁缁戝畾缃戝叧
- ///// </summary>
- //public bool isBindGateway;
- /// <summary>
- /// 浣忓畢鍦板潃
- /// </summary>
- public string homeAddress;
- }
}
--
Gitblit v1.8.0