From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/AirQualityComparisonVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/AirQualityComparisonVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/AirQualityComparisonVO.java
index bc4d201..a3300f1 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/AirQualityComparisonVO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/AirQualityComparisonVO.java
@@ -37,6 +37,10 @@
private ConcentrationAndPercent serverDays;
+
+
+
+
public String getCityName() {
return cityName;
}
@@ -44,7 +48,7 @@
public ConcentrationAndPercent getCompositeIndex() {
return compositeIndex;
}
- @JsonProperty("PM25")
+ @JsonProperty("PM2_5")
public ConcentrationAndPercent getPM25() {
return PM25;
}
--
Gitblit v1.8.0