From dfa6733793434bdcfd394f978ae72f1628b2260f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 22 四月 2020 16:50:03 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs
old mode 100755
new mode 100644
index 64b9ea0..df25e36
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetForm.cs
@@ -6,8 +6,7 @@
{
public class PanelFangyueFreshAirTargetForm : EditorCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
-
+ #region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 鍒楄〃鎺т欢
/// </summary>
@@ -308,9 +307,7 @@
//鏀堕泦鍙互鏄剧ず鐨勮澶�
this.dicShowDevice[room.Id].Add(device);
}
- }
-
-
+ }
}
return canShow;
}
@@ -320,8 +317,7 @@
bool canShow = false;
return canShow;
- }
-
+ }
#endregion
}
}
--
Gitblit v1.8.0