From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index 2f724d6..5c9043f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -10,10 +10,13 @@
private String id;
- @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 180)
private String entrustCode;
- @ValueTableShow(value = 2,name = "鏍峰搧鍚嶇О")
+ @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ @ValueTableShow(value = 3,name = "鏍峰搧鍚嶇О")
private String sample;
@ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
@@ -22,8 +25,19 @@
@ValueTableShow(value = 5,name = "鐘舵��")
private String insState;
+ @ValueTableShow(value = 5,name = "妫�楠屼汉")
+ private String userName;
+ @ValueTableShow(value = 5,name = "澶嶆牳浜�")
+ private String checkName;
+
+ private Integer userId;
+ private String userNameId;
+
@ValueTableShow(value = 8,name = "妫�楠屽紑濮嬫椂闂�")
private String insTime;
+
+ @ValueTableShow(value = 9,name = "妫�楠岀粨鏉熸椂闂�")
+ private String submitTime;
@ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
private String appointed;
@@ -31,15 +45,22 @@
@ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
private String sendTime;
- @ValueTableShow(value = 8,name = "鐞嗙敱")
+ @ValueTableShow(value = 10,name = "鐞嗙敱")
private String verifyTell;
- private Integer userId;
private String sonLaboratory;
private Integer orderUserId;
+ private Integer sampleId;
+
private Integer verifyUser;
+ private Integer orderStateId;
+
+ private Integer sort;
+ private Integer version;
+ private Integer num1;
+
}
--
Gitblit v1.9.3