From ec9a95eb994018cc1ba28a80946165f795001dea Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:49:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 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 02506a9..f82e768 100644
--- a/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
+++ b/business/src/main/java/com/ycl/domain/entity/ProjectPlanInfo.java
@@ -5,6 +5,7 @@
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;
@@ -18,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;
@@ -35,23 +36,13 @@
private Integer progressStatus;
@TableField("start_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 璁″垝寮�濮嬫椂闂� */
private Date startTime;
@TableField("end_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
/** 璁″垝瀹屾垚鏃堕棿 */
private Date endTime;
- /** 鍒涘缓鏃堕棿 */
- @TableField(exist = false)
- private Date gmtCreate;
-
- /** 淇敼鏃堕棿 */
- @TableField(exist = false)
- private Date gmtUpdate;
-
- @TableField(exist = false)
- private Integer deleted;
}
--
Gitblit v1.8.0