Merge branch 'dev-tzy' into dev-2020xm

xm

2020-07-14 d87400af518ebc9274f4447f06476959c3aa5102

 ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs

old mode 100644
new mode 100755
@@ -11,6 +11,22 @@
        public PMSensor()
        {
            this.Type = DeviceType.PMSensor;
        }
        }



        /// <summary>
        /// 当前温度   
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int currentTemperature = 0;

        /// <summary>
        /// 当前湿度 
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int currentHumidity = 0;

        /// <summary>
        /// 当前PM2.5值
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public int currentPmData = 0;
    }
}