From c3ee76c79cc5c5db479b548e1b4eca67327e7396 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 06 八月 2024 11:28:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 1cd93c8..430d9e1 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,11 +10,11 @@
private String id;
- @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 180)
private String entrustCode;
- @ValueTableShow(value = 2,name = "鏍峰搧绫诲瀷")
- private String sampleType;
+ @ValueTableShow(value = 2,name = "鏍峰搧鍚嶇О")
+ private String sample;
@ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
private String type;
@@ -22,8 +22,15 @@
@ValueTableShow(value = 5,name = "鐘舵��")
private String insState;
- @ValueTableShow(value = 8,name = "妫�楠岀粨鏋�")
- private Integer insResult;
+ @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;
@@ -31,8 +38,14 @@
@ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
private String sendTime;
- private Integer userId;
+ @ValueTableShow(value = 8,name = "鐞嗙敱")
+ private String verifyTell;
+
private String sonLaboratory;
+ private Integer orderUserId;
+
+ private Integer verifyUser;
+
}
--
Gitblit v1.9.3