From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
new file mode 100644
index 0000000..1c37670
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java
@@ -0,0 +1,38 @@
+package com.zt.life.modules.configItemWarehouse.dto;
+
+import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
+import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
+import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
+import com.zt.life.modules.project.model.Project;
+import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
+import com.zt.life.sys.dto.OssDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class ConfigItemWarehouseDto {
+    private Long id;
+    private Long projectId;
+    private Long warehouseId;
+
+    @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+    private Project project;
+    @ApiModelProperty(value = "閰嶇疆椤瑰叆搴�")
+    private ConfigItemWarehouse configItemWarehouse;
+    @ApiModelProperty(value = "闄勪欢")
+    private OssDto files;
+
+    @ApiModelProperty(value = "鍏ュ簱閰嶇疆椤�")
+    private List<WarehouseConfigItem> configItemList = new ArrayList<>();
+    @ApiModelProperty(value = "CM瀹℃牳")
+    private List<WarehouseCmAudit> cmAuditList = new ArrayList<>();
+    @ApiModelProperty(value = "QA瀹℃牳")
+    private List<WarehouseQaAudit> qaAuditList = new ArrayList<>();
+}
+

--
Gitblit v1.9.1