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-job/src/main/java/com/moral/api/entity/HistoryWeekly.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/entity/HistoryWeekly.java b/screen-job/src/main/java/com/moral/api/entity/HistoryWeekly.java
index 85e065c..e083bd6 100644
--- a/screen-job/src/main/java/com/moral/api/entity/HistoryWeekly.java
+++ b/screen-job/src/main/java/com/moral/api/entity/HistoryWeekly.java
@@ -1,8 +1,9 @@
package com.moral.api.entity;
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 +29,7 @@
/**
* ������
*/
- private LocalDateTime time;
+ private Date time;
/**
* ������
--
Gitblit v1.8.0