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/SampleProductDto.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
index 55699f8..a8015ff 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
@@ -11,6 +11,16 @@
private List<InsProduct> insProduct;
- private List<BushingDto> bushing;
+ private List<SampleProductDto> childSampleList;
+
+ private InsulatingDto insulating;
+
+ private SheathDto sheath;
+
+ //妫�楠屼汉
+ private String checkName;
+
+ //娆℃暟(妫�楠屾鏁�)
+ private Integer num1;
}
--
Gitblit v1.9.3