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/CityAqiMonthly.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/CityAqiMonthly.java b/screen-api/src/main/java/com/moral/api/entity/CityAqiMonthly.java
index 4850e16..e60a07c 100644
--- a/screen-api/src/main/java/com/moral/api/entity/CityAqiMonthly.java
+++ b/screen-api/src/main/java/com/moral/api/entity/CityAqiMonthly.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;
@@ -16,7 +18,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-public class CityAqiMonthly extends Model<CityAqiMonthly> {
+public class CityAqiMonthly extends Model<CityAqiMonthly>{
private static final long serialVersionUID = 1L;
@@ -28,7 +30,7 @@
/**
* ������
*/
- private LocalDateTime time;
+ private Date time;
/**
* ������
--
Gitblit v1.8.0