From 547b51661fefe8d7b88640b29a60db8874f5efac Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 14 Mar 2022 16:27:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/entity/CityWeather.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/CityWeather.java b/screen-api/src/main/java/com/moral/api/entity/CityWeather.java
index 18eef33..553fca5 100644
--- a/screen-api/src/main/java/com/moral/api/entity/CityWeather.java
+++ b/screen-api/src/main/java/com/moral/api/entity/CityWeather.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