From 6c3b64f52182038accf1c27a2f040d64ddc4528a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 07 六月 2024 11:15:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java |    4 ++++
 1 files changed, 4 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..7dea47f 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,8 @@
 
     private List<InsProduct> insProduct;
 
+    private List<BushingDto> bushing;
+
+    private List<SampleProductDto> childSampleList;
+
 }

--
Gitblit v1.9.3