From 0d05424b5df05f2e6ef478934cdaad9c71e5d91d Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 18 九月 2024 09:34:56 +0800
Subject: [PATCH] product name and type
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index c430029..e11151c 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -5,12 +5,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
+import com.dy.pmsGlobal.pojoBa.BaUser;
import jakarta.validation.constraints.NotNull;
import lombok.*;
-
-
import java.util.Date;
+import java.util.List;
/**
* 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
@@ -41,7 +41,6 @@
/**
* 鐢熶骇绾垮疄浣撶紪鍙�
*/
- @NotNull(message="[鐢熶骇绾垮疄浣撶紪鍙穄涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long lineId;
@@ -56,6 +55,15 @@
@TableField(exist = false)
public String stationName;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long proId;
+
+ @TableField(exist = false)
+ public String proName;
+
+ @TableField(exist = false)
+ public String devicePrefix;
/**
* 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
@@ -85,6 +93,9 @@
@TableField(exist = false)
public String nodeName;
+
+ public Integer workType;
+
/**
* 浠诲姟璁ら鏃堕棿
*/
@@ -106,5 +117,8 @@
*/
public String assistants;
+ @TableField(exist = false)
+ public List<BaUser> assistantsList;
+
}
--
Gitblit v1.8.0