From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm

---
 ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
old mode 100755
new mode 100644
index 5008025..a3051f6
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
@@ -14,12 +14,12 @@
         }
 
         /// <summary>
-        /// 褰撳墠娓╁害   
+        /// 褰撳墠娓╁害
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
         public int currentTemperature = 0;
         /// <summary>
-        /// 褰撳墠婀垮害 
+        /// 褰撳墠婀垮害
         /// </summary>
         [Newtonsoft.Json.JsonIgnore]
         public int currentHumidity = 0;

--
Gitblit v1.8.0