From 66990e9be43f71b89aa42065d696b682d803afa6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 10:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 5e796ca..88a129d 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,7 +13,10 @@
@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 = "绱ф�ョ▼搴�")
@@ -28,6 +31,10 @@
private String checkName;
private Integer userId;
+ private String userNameId;
+
+ @ValueTableShow(value = 6,name = "鎶ユ鏃堕棿")
+ private String createTime;
@ValueTableShow(value = 8,name = "妫�楠屽紑濮嬫椂闂�")
private String insTime;
@@ -44,11 +51,12 @@
@ValueTableShow(value = 10,name = "鐞嗙敱")
private String verifyTell;
-
private String sonLaboratory;
private Integer orderUserId;
+ private Integer sampleId;
+
private Integer verifyUser;
private Integer orderStateId;
--
Gitblit v1.9.3