From c377d90fe2a01c2118f6c69c3c177f75be7c318b Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 29 十一月 2024 15:20:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
index 5b24168..52b355e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/Damage.java
@@ -2,8 +2,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
import java.io.Serializable;
+import java.sql.Timestamp;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -25,9 +26,14 @@
private Long id;
/**
+ * 绾胯矾
+ */
+ private Integer line;
+
+ /**
* 宸ュ簭
*/
- private Integer workingProcedureId;
+ private String workingProcedure;
/**
* 鐜荤拑id
@@ -47,7 +53,7 @@
/**
* 鐢熶骇鏃堕棿
*/
- private LocalDateTime damageTime;
+ private Timestamp damageTime;
/**
* 澶囨敞
@@ -67,7 +73,7 @@
/**
* 娴佺▼鍗�
*/
- private Integer processId;
+ private String processId;
/**
* 搴忓彿
--
Gitblit v1.8.0