From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)

---
 ZigbeeApp/Shared/Common/House.cs |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 4605ec3..ae86e44 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -1,6 +1,5 @@
 锘縰sing System;
 using System.Collections.Generic;
-using Shared.Phone;
 using Shared.Phone.UserCenter;
 
 namespace Shared.Common
@@ -35,7 +34,11 @@
         /// <summary>
         /// 鏄惁涓哄叾浠栦富鐢ㄦ埛鍒嗕韩杩囨潵鐨勪綇瀹�
         /// </summary>
-        public bool IsOtherShare;
+        public bool IsOthreShare;
+        /// <summary>
+        /// 褰撳墠浣忓畢鏄叾浠栦富甯愬彿鍒嗕韩杩囨潵鐨勪富甯愬彿鐨勫垎甯冨紡Id
+        /// </summary>
+        public string MainUserDistributedMark;
         /// <summary>
         /// 璇ヤ綇瀹呮槸鍚︽槸铏氭嫙鐨�,true鐨勮瘽浠ｈ〃缃戝叧鍜岃澶囬兘鏄櫄鎷熺殑(榛樿涓篺alse)
         /// </summary>
@@ -51,11 +54,7 @@
         /// <summary>
         /// 绾害
         /// </summary>
-        public double Latitude = 0;
-        /// <summary>
-        /// 鏄惁鎷ユ湁杩滅▼鎺у埗鏉冮檺
-        /// </summary>
-        public bool IsRemoteControl = false;
+        public double Latitude = 0;
         /// <summary>
         /// 浣忓畢鎵�鍦ㄧ殑鍦扮悊浣嶇疆鐨勫悕绉�
         /// </summary>
@@ -117,7 +116,7 @@
         /// 褰撳墠瀛樻斁浣忓畢鏁版嵁鐨勬枃浠跺す鍚嶅瓧(姝ゅ彉閲忔槸缁欐湰鏈哄浠�,鎴栬�呬簯绔笅杞藉浠戒娇鐢ㄧ殑,璇锋棤瑙嗚繖涓彉閲�)
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
-        public string SaveDirctoryName = string.Empty;
+        public string SaveDirctoryName = string.Empty;
 
         #endregion
 

--
Gitblit v1.8.0