From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 19 ++++++++++++++-----
1 files changed, 14 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 11260ae..cad79b6 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,11 +13,8 @@
@ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
private String entrustCode;
- @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿")
- private String sampleCode;
-
- @ValueTableShow(value = 3,name = "鏍峰搧鍚嶇О")
- private String sample;
+ @ValueTableShow(value = 2,name = "鏍峰搧绫诲瀷")
+ private String sampleType;
@ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
private String type;
@@ -25,10 +22,22 @@
@ValueTableShow(value = 5,name = "鐘舵��")
private String insState;
+ @ValueTableShow(value = 8,name = "妫�楠岀粨鏋�")
+ private Integer insResult;
+
@ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
private String appointed;
@ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
private String sendTime;
+ @ValueTableShow(value = 8,name = "鐞嗙敱")
+ private String verifyTell;
+
+ private Integer userId;
+
+ private String sonLaboratory;
+
+ private Integer orderUserId;
+
}
--
Gitblit v1.9.3