From 9a4629512ccf8359efd88671c9317c3cc7faf0c8 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 29 八月 2022 16:46:40 +0800
Subject: [PATCH] Merge branch 'dev' into dev-temp
---
ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
index 5008025..5c61200 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
@@ -14,19 +14,16 @@
}
/// <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>
- [Newtonsoft.Json.JsonIgnore]
public int currentPmData = 0;
}
}
--
Gitblit v1.8.0