From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/entity/CityAqi.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 f76c3d5..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
@@ -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