From ea7e96af3785241c34f6a6385fb10745328c3e56 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 23 七月 2024 11:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 7608e42..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
@@ -41,7 +41,6 @@
/**
* 鐢熶骇绾垮疄浣撶紪鍙�
*/
- @NotNull(message="[鐢熶骇绾垮疄浣撶紪鍙穄涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long lineId;
@@ -56,6 +55,9 @@
@TableField(exist = false)
public String stationName;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long proId;
@TableField(exist = false)
public String proName;
@@ -92,9 +94,7 @@
@TableField(exist = false)
public String nodeName;
- public Integer nodeType;
-
-
+ public Integer workType;
/**
* 浠诲姟璁ら鏃堕棿
--
Gitblit v1.8.0