From 6abb85bba678dee5d8aee82dbcd18758690402db Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 十二月 2024 10:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
index 577148c..78d3318 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -1,6 +1,7 @@
package com.mes.engineering.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -32,11 +33,12 @@
*/
private String engineerId;
-
/**
* 璁惧
*/
- private String stationCell;
+ private Integer stationCell;
+
+
/**
* 宸ョ▼鍚嶇О
@@ -103,5 +105,9 @@
*/
private String notes;
-
+ /**
+ * 闄よ啘鏂瑰紡
+ */
+ @TableField(exist = false)
+ private Integer filmRemove;
}
--
Gitblit v1.8.0