From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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..d4e6ec2 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
@@ -13,8 +13,8 @@
@ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
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,13 @@
@ValueTableShow(value = 5,name = "鐘舵��")
private String insState;
- @ValueTableShow(value = 8,name = "妫�楠岀粨鏋�")
- private Integer insResult;
+ @ValueTableShow(value = 5,name = "璐熻矗浜�")
+ private String userName;
+
+ private Integer userId;
+
+ @ValueTableShow(value = 8,name = "妫�楠屽紑濮嬫椂闂�")
+ private String insTime;
@ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
private String appointed;
@@ -31,8 +36,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