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 | 38 +++++++++++++++++++++++++++++++++++--- 1 files changed, 35 insertions(+), 3 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..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 @@ -10,9 +10,7 @@ private String id; - private String sampleUserId; - - @ValueTableShow(value = 1,name = "濮旀墭缂栧彿") + @ValueTableShow(value = 1,name = "濮旀墭缂栧彿",width = 180) private String entrustCode; @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿") @@ -27,10 +25,44 @@ @ValueTableShow(value = 5,name = "鐘舵��") private String insState; + @ValueTableShow(value = 5,name = "妫�楠屼汉") + private String userName; + @ValueTableShow(value = 5,name = "澶嶆牳浜�") + private String checkName; + + private Integer userId; + private String userNameId; + + @ValueTableShow(value = 6,name = "鎶ユ鏃堕棿") + private String createTime; + + @ValueTableShow(value = 8,name = "妫�楠屽紑濮嬫椂闂�") + private String insTime; + + @ValueTableShow(value = 9,name = "妫�楠岀粨鏉熸椂闂�") + private String submitTime; + @ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿") private String appointed; @ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿") private String sendTime; + @ValueTableShow(value = 10,name = "鐞嗙敱") + private String verifyTell; + + private String sonLaboratory; + + private Integer orderUserId; + + private Integer sampleId; + + private Integer verifyUser; + + private Integer orderStateId; + + private Integer sort; + private Integer version; + private Integer num1; + } -- Gitblit v1.9.3