From 85766196b2b6588e8dec502366b3c5619133004c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 三月 2025 17:35:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after

---
 inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 e07cf1b..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,12 +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