Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

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