合并xm2021-01-13 wjc2021-02-06

黄学彪

2021-01-14 d78515ac4ac8cf4a1785d9df18058d6724f12b79

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs

@@ -432,8 +432,8 @@
                    humidity = $"{tempera.currentHumidity}%";
                    temperature = $"{tempera.currentTemperature}℃";
                    pm = $"{tempera.currentPmData}μg/m³";
                    co2 = $"{tempera.currentCO2}ppm";
                    return $"{curQuality},{pm},{co2},{temperature},{humidity}";
                    //co2 = $"{tempera.currentCO2}ppm";
                    return $"{curQuality},{pm},{temperature},{humidity}";
                }
                else
                {