From ac9ba01f811d9755204a82bd7bd9a444139711fd Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 10 三月 2025 09:49:05 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
index 1f61c32..6e3acde 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.inspect.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -85,7 +86,7 @@
@ApiModelProperty("瀛愬疄楠屽")
private String sonLaboratory;
-
+ private String sampleStr;
--
Gitblit v1.9.3