From 7787f57521297df847bfd5f2b9af410b3fdac67e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 十月 2026 16:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java
index 8c25cbd..6fd3af6 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPrintingVo.java
@@ -4,7 +4,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
/**
* @Author zhuo
@@ -22,12 +22,15 @@
@Schema(description = "鐢熶骇鍗曚綅")
private String production;
+ @Schema(description = "鏍峰搧澶栬")
+ private String sampleStatus;
+
@Schema(description = "瑙勬牸鍨嬪彿")
private String sampleModel;
- @Schema(description = "濮旀墭鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime sendTime;
+ @Schema(description = "閫佹牱鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate sampleDate;
@Schema(description = "濮旀墭浜�")
private String prepareUser;
--
Gitblit v1.9.3