From dbe3ed318dfe013663271fd64c8b8b152005e0b6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 08 十月 2024 09:31:32 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 1e78c77..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
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import com.dy.pmsGlobal.pojoBa.BaUser;
-import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import jakarta.validation.constraints.NotNull;
import lombok.*;
@@ -42,7 +41,6 @@
/**
* 鐢熶骇绾垮疄浣撶紪鍙�
*/
- @NotNull(message="[鐢熶骇绾垮疄浣撶紪鍙穄涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long lineId;
@@ -57,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;
/**
* 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
@@ -87,10 +94,8 @@
@TableField(exist = false)
public String nodeName;
- public Integer nodeType;
+ public Integer workType;
- @TableField(exist = false)
- public PrAssemblyPlan plan;
/**
* 浠诲姟璁ら鏃堕棿
*/
--
Gitblit v1.8.0