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 | 6 +++---
1 files changed, 3 insertions(+), 3 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..1c37670 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,9 +25,8 @@
private Project project;
@ApiModelProperty(value = "閰嶇疆椤瑰叆搴�")
private ConfigItemWarehouse configItemWarehouse;
- @ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
- private TestAgencyInfo TestAgencyInfo;
-
+ @ApiModelProperty(value = "闄勪欢")
+ private OssDto files;
@ApiModelProperty(value = "鍏ュ簱閰嶇疆椤�")
private List<WarehouseConfigItem> configItemList = new ArrayList<>();
--
Gitblit v1.9.1