From 2c743103cfa6e24bcb3fd064845c8cfd8fe8bbe6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 14:02:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/entity/CityAqi.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/CityAqi.java b/screen-api/src/main/java/com/moral/api/entity/CityAqi.java
index fc173c4..453ec3e 100644
--- a/screen-api/src/main/java/com/moral/api/entity/CityAqi.java
+++ b/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();
+ }
}
--
Gitblit v1.8.0