Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-11-15 be8a4a6f82bd32dc5a3cf2e038848012f336f644

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