From e2cef6c358e57c2bc63e67a05c88c52585bb96db Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期五, 29 十二月 2023 11:22:29 +0800
Subject: [PATCH] 项目表

---
 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java
index 7a25f53..e8418aa 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java
@@ -4,7 +4,7 @@
 import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
 import com.zt.life.modules.project.model.*;
 import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
-import com.zt.life.sys.dto.OssDto;
+import com.zt.modules.workflow.dto.FlowInfoDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,11 +16,15 @@
     private Long id;
     private Long projectId;
     private Long circulatOrderid;
+    private String stepIdMark;
 
-    @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
-    private Project project;
+    private FlowInfoDto flowInfoDto;
+
     @ApiModelProperty(value = "鐗╁搧娴佽浆鍗�")
     private ItemCirculatOrder circulatOrder;
+    @ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
+    private Project project;
+
     @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
     private TestAgencyInfo TestAgencyInfo;
 

--
Gitblit v1.9.1