From 9183a9a18a910d5b099119240a86a3a87ce42106 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 da5facc..7a65f08 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,15 +10,10 @@
private String id;
- private String sampleUserId;
-
- @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 190)
private String entrustCode;
- @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿")
- private String sampleCode;
-
- @ValueTableShow(value = 3,name = "鏍峰搧鍚嶇О")
+ @ValueTableShow(value = 2,name = "鏍峰搧鍚嶇О")
private String sample;
@ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
@@ -27,10 +22,30 @@
@ValueTableShow(value = 5,name = "鐘舵��")
private String insState;
+ @ValueTableShow(value = 5,name = "妫�楠屼汉")
+ private String userName;
+ @ValueTableShow(value = 5,name = "澶嶆牳浜�")
+ private String checkName;
+
+ private Integer userId;
+
+ @ValueTableShow(value = 8,name = "妫�楠屽紑濮嬫椂闂�")
+ private String insTime;
+
@ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
private String appointed;
@ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
private String sendTime;
+ @ValueTableShow(value = 8,name = "鐞嗙敱")
+ private String verifyTell;
+
+
+ private String sonLaboratory;
+
+ private Integer orderUserId;
+
+ private Integer verifyUser;
+
}
--
Gitblit v1.9.3