From f491d30b0a69148bd0991b3d5b1c4cf9f8216949 Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期五, 12 一月 2024 09:52:39 +0800 Subject: [PATCH] 修改 --- modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/dto/ItemCirculatOrderDto.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 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 ebc9840..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,15 +16,18 @@ 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; - @ApiModelProperty(value = "闄勪欢") - private OssDto files; + @ApiModelProperty(value = "鎶�鏈祫鏂�") private List<ItemCirculatOrderTechnical> technicalList = new ArrayList<>(); -- Gitblit v1.9.1