From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期三, 29 十一月 2023 17:03:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dto/ConfigItemWarehouseDto.java | 3 +-- 1 files changed, 1 insertions(+), 2 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 index 25ebad0..13810f6 100644 --- 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 @@ -8,6 +8,7 @@ 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; @@ -24,8 +25,6 @@ private Project project; @ApiModelProperty(value = "閰嶇疆椤瑰叆搴�") private ConfigItemWarehouse configItemWarehouse; - @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅") - private TestAgencyInfo TestAgencyInfo; @ApiModelProperty(value = "鍏ュ簱閰嶇疆椤�") -- Gitblit v1.9.1