From e929e18f8d04e72a23c24b06b89ab2d7be6f9c84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 28 十一月 2024 06:04:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java b/business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java
index 7e51dcb..b170006 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectPlanProgressReport.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.system.domain.base.AbsEntity;
+import com.ycl.system.domain.base.AbsEntityOnlyId;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* 杩涘害涓婃姤鍐呭
@@ -16,7 +18,7 @@
*/
@Data
@TableName("t_project_plan_progress_report")
-public class ProjectPlanProgressReport extends AbsEntity {
+public class ProjectPlanProgressReport extends AbsEntityOnlyId {
private static final long serialVersionUID = 1L;
@@ -26,11 +28,11 @@
@TableField("start_time")
/** 瀹為檯寮�濮嬫椂闂� */
- private LocalDateTime startTime;
+ private Date startTime;
@TableField("end_time")
/** 瀹為檯瀹屾垚鏃堕棿 */
- private LocalDateTime endTime;
+ private Date endTime;
@TableField("progress_status")
/** 杩涘害鎯呭喌 */
--
Gitblit v1.8.0