From bc44044892b29973b6faab8cccc0bbf317e601de Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 09:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java b/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
index 421f60b..9753e95 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
@@ -1,11 +1,15 @@
package com.ycl.domain.entity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.base.AbsEntity;
+import com.ycl.system.domain.base.AbsEntityOnlyIdAndDeleted;
import lombok.Data;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* 椤圭洰璁″垝椤�
@@ -15,7 +19,7 @@
*/
@Data
@TableName("t_project_plan_info")
-public class ProjectPlanInfo extends AbsEntity {
+public class ProjectPlanInfo extends AbsEntityOnlyIdAndDeleted {
private static final long serialVersionUID = 1L;
@@ -33,11 +37,10 @@
@TableField("start_time")
/** 璁″垝寮�濮嬫椂闂� */
- private LocalDateTime startTime;
+ private Date startTime;
@TableField("end_time")
/** 璁″垝瀹屾垚鏃堕棿 */
- private LocalDateTime endTime;
-
+ private Date endTime;
}
--
Gitblit v1.8.0