From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 29 七月 2024 18:51:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java index 96c8b08..a0f4f45 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java @@ -7,8 +7,6 @@ import java.io.Serializable; import java.time.LocalDateTime; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; /** * <p> @@ -19,6 +17,7 @@ * @since 2023-05-29 */ @Data +@TableName("t_delay_task") public class DelayTask implements Serializable { private static final long serialVersionUID = 1L; @@ -41,8 +40,8 @@ /** * 执行时间 */ - @TableField("end_time") - private LocalDateTime endTime; + @TableField("execute_time") + private LocalDateTime executeTime; @TableField("create_time") private LocalDateTime createTime; -- Gitblit v1.7.1