Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

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

@@ -16,14 +16,17 @@
        /// <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;
    }
}