From a9cc2343ceaad3e99dc25eb036dc99aeded279a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:26:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 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