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

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

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