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

cjl

2023-08-18 acb0dc47e516cf6942ebe268d9a3fce7944963b9

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