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/CommonDevice.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
old mode 100755
new mode 100644
index 1c52a82..8bf4381
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -377,17 +377,17 @@
                 }
                 else if (this.Type == DeviceType.Thermostat)
                 {
-                    //绌鸿皟 
+                    //绌鸿皟
                     IconPath = "Device/AirConditionerEpoint.png";
                 }
                 else if (this.Type == DeviceType.FreshAir)
                 {
-                    //鏂伴 
+                    //鏂伴
                     IconPath = "Device/FreshAirEpoint.png";
                 }
                 else if (this.Type == DeviceType.PMSensor)
                 {
-                    //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� 
+                    //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
                     IconPath = "Device/AirQualitySensorEpoint.png";
                 }
                 else if (this.Type == DeviceType.FreshAirHumiditySensor)

--
Gitblit v1.8.0