From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 eff48f1..e07cf1b 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,4 +11,12 @@
private List<InsProduct> insProduct;
+ private List<BushingDto> bushing;
+
+ private List<SampleProductDto> childSampleList;
+
+ private InsulatingDto insulating;
+
+ private SheathDto sheath;
+
}
--
Gitblit v1.9.3