From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
index 5008025..ae70ba4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
@@ -14,15 +14,13 @@
}
/// <summary>
- /// 褰撳墠娓╁害
+ /// 褰撳墠娓╁害
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public int currentTemperature = 0;
+ public decimal currentTemperature = 0;
/// <summary>
/// 褰撳墠婀垮害
/// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public int currentHumidity = 0;
+ public decimal currentHumidity = 0;
/// <summary>
/// 褰撳墠PM2.5鍊�
/// </summary>
--
Gitblit v1.8.0