From 476740c4330135b38be6a32f54dbe1bbcd32476a Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期一, 13 一月 2025 13:20:56 +0800 Subject: [PATCH] Merge branch 'master' into cnas --- inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java index dca5bd8..e0ad6d7 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java @@ -2,12 +2,16 @@ import lombok.Data; +import java.util.List; + @Data public class InsReportDto1 { - private String laboratory; - private Integer num; - private Integer insOrderUsersId; + private Integer sampleId; + + private List<InsReportDto2> insReportDto2s; + + } -- Gitblit v1.9.3