From a7adf98ff4ac801342853b1f9231cc1ab5acebf3 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 14 十一月 2019 17:25:42 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
index 15f262f..194abf6 100644
--- a/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneTargetDeviceUI.cs
@@ -32,8 +32,8 @@
/// </summary>
public int DelayTime = 0;
/// <summary>
- /// 褰揟ype=2鏃跺瓨鍦�
- /// 寤舵椂鎵ц搴忓彿锛岃〃绀虹鍑犱釜寤舵椂鍔ㄤ綔
+ /// 褰揟ype=2鏃跺瓨鍦�
+ /// 寤舵椂鎵ц搴忓彿锛岃〃绀虹鍑犱釜寤舵椂鍔ㄤ綔
/// </summary>
public int DelayTimeSerialNumber = 0;
@@ -179,7 +179,6 @@
}
return $"{tempareture},{model},{wind}";
}
-
else
{
return null;
--
Gitblit v1.8.0