From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-api/src/main/java/com/moral/api/entity/CityAqiYearly.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/CityAqiYearly.java b/screen-api/src/main/java/com/moral/api/entity/CityAqiYearly.java
index c9a1f71..d2d7d73 100644
--- a/screen-api/src/main/java/com/moral/api/entity/CityAqiYearly.java
+++ b/screen-api/src/main/java/com/moral/api/entity/CityAqiYearly.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +30,7 @@
     /**
      * ������
      */
-    private LocalDateTime time;
+    private Date time;
 
     /**
      * ������

--
Gitblit v1.8.0