From a016e3f59d1b2227cd22aeb82090b82d487c8235 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 十二月 2024 14:36:42 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java | 12 ++++++++++--
1 files changed, 10 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 7dea47f..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,8 +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