From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
index 81b8515..1110404 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
@@ -3,14 +3,44 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
-public class InsOrderPlanVO{
+@Schema(description = "妫�楠屼换鍔″垪琛ㄤ俊鎭�")
+public class InsOrderPlanVO {
+    @Schema(description = "閫佹牱鏃ユ湡")
+    private LocalDate sampleDate;
 
-
+    @Schema(description = "濮旀墭鍗旾D")
     private Integer id;
 
     @Schema(description = "濮旀墭缂栧彿")
     private String entrustCode;
+
+    @Schema(description = "浠诲姟鏉ユ簮")
+    private String taskSource;
+    @Schema(description = "璐ㄩ噺鐩戞帶璁″垝鏄庣粏ID")
+    private Integer qualityMonitorDetailsId;
+    @Schema(description = "鐩戞帶椤圭洰")
+    private String monitorProject;
+    @Schema(description = "璁″垝鏈熼檺")
+    private String dueDate;
+    @Schema(description = "鐩戞帶鐩殑")
+    private String monitorPurpose;
+    @Schema(description = "鐩戞帶鏂瑰紡")
+    private String monitorWay;
+    @Schema(description = "鏍峰搧瑙勬牸")
+    private String sampleSpec;
+    @Schema(description = "鏍囧噯缂栧彿")
+    private String standardCode;
+    @Schema(description = "璇勪环浜篒D")
+    private Integer evaluatorUserId;
+    @Schema(description = "鐩戞帶璁″垝鎵瑰噯浜篒D")
+    private Integer planRatifyUserId;
+    @Schema(description = "璐ㄩ噺鐩戞帶璇勪环鐘舵��")
+    private Integer evaluateStatus;
+    @Schema(description = "鎶�鏈爣鍑嗘枃鏈�")
+    private String technicalStandardText;
 
     @Schema(description = "鏍峰搧鍚嶇О")
     private String sample;
@@ -36,6 +66,7 @@
     @Schema(description = "澶嶆牳浜�")
     private String checkName;
 
+    @Schema(description = "鐢ㄦ埛ID")
     private Integer userId;
 
     @Schema(description = "妫�楠屽紑濮嬫椂闂�")
@@ -50,11 +81,17 @@
     @Schema(description = "鐞嗙敱")
     private String verifyTell;
 
+    @Schema(description = "鎶ュ憡閫�鍥炲埌妫�楠屼换鍔$殑鏉ユ簮锛欰PPROVED 涓烘壒鍑嗙幆鑺傦紝REPORT_REVIEW 涓哄鏍哥幆鑺�")
+    private String reportReturnSource;
 
+
+    @Schema(description = "瀛愬疄楠屽")
     private String sonLaboratory;
 
+    @Schema(description = "涓嬪崟浜篒D")
     private Integer orderUserId;
 
+    @Schema(description = "澶嶆牳浜篒D")
     private Integer verifyUser;
 
     @Schema(description = "涓嬪崟绫诲埆")

--
Gitblit v1.9.3