From f5ba05c33393e55de28db91433901600bfb0658f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 五月 2020 17:43:11 +0800
Subject: [PATCH] 请合并最新代码「20200522:添加门锁晚上9点上报常开功能，优化PM2.5测试功能」
---
ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
old mode 100755
new mode 100644
index a294679..85a1f1f
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -882,7 +882,7 @@
/// <summary>
/// 瀹夐槻鎶ヨ淇℃伅绫�
/// </summary>
- public class SafeguardAlarmInfo: DeviceAlarmInfo
+ public class SafeguardAlarmInfo : DeviceAlarmInfo
{
/// <summary>
/// 涓婃姤绫诲瀷
@@ -1295,7 +1295,7 @@
/// <summary>
/// 鑷姩鍖栧父寮�鏃堕棿鍙樻洿涓哄垎閽�,鑰屼笉鏄皬鏃� 1->寮哄埗鍙樻洿涓哄垎閽�
/// </summary>
- public int DoorLockNomallyOpenTimeMode = 0;
+ public int DoorLockNomallyOpenTimeMode = 1;
}
#endregion
--
Gitblit v1.8.0