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

jinpengyong

2023-08-23 8c741905bff160816524a54df00a4acca684b770

 screen-api/src/main/java/com/moral/api/entity/CityAqi.java

@@ -24,7 +24,7 @@
    /**
     * 城市id
     */
    private String cityCode;
    private Integer cityCode;

    /**
     * 时间
@@ -42,4 +42,24 @@
        return null;
    }

    public CityAqi() {
    }

    public CityAqi(CityAqiDaily cityAqiDaily) {
        this.cityCode = cityAqiDaily.getCityCode();
        this.value = cityAqiDaily.getValue();
        this.time = cityAqiDaily.getTime();
    }

    public CityAqi(CityAqiMonthly cityAqiMonthly) {
        this.cityCode = cityAqiMonthly.getCityCode();
        this.value = cityAqiMonthly.getValue();
        this.time = cityAqiMonthly.getTime();
    }

    public CityAqi(CityAqiYearly cityAqiYearly) {
        this.cityCode = cityAqiYearly.getCityCode();
        this.value = cityAqiYearly.getValue();
        this.time = cityAqiYearly.getTime();
    }
}