From 3b6e6d6dc6a6743a6b4ca7701dcb2ae1e6e7a26e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 28 五月 2024 09:20:47 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/DelayTask.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..83538f5 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
@@ -41,8 +41,8 @@
/**
* 执行时间
*/
- @TableField("end_time")
- private LocalDateTime endTime;
+ @TableField("execute_time")
+ private LocalDateTime executeTime;
@TableField("create_time")
private LocalDateTime createTime;
--
Gitblit v1.7.1