From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialClassificationDto.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialClassificationDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialClassificationDto.java
index f8d57a1..0253a0b 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialClassificationDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/MaterialClassificationDto.java
@@ -7,8 +7,8 @@
private Long materialClassifyId;
//物资类型名称
private String materialClassifyName;
- private List<MaterialDepartmentDto> departmentList;
+ private List<BaseMaterialDto> baseMaterialList;
public Long getMaterialClassifyId() {
return materialClassifyId;
}
@@ -25,11 +25,11 @@
this.materialClassifyName = materialClassifyName;
}
- public List<MaterialDepartmentDto> getDepartmentList() {
- return departmentList;
+ public List<BaseMaterialDto> getBaseMaterialList() {
+ return baseMaterialList;
}
- public void setDepartmentList(List<MaterialDepartmentDto> departmentList) {
- this.departmentList = departmentList;
+ public void setBaseMaterialList(List<BaseMaterialDto> baseMaterialList) {
+ this.baseMaterialList = baseMaterialList;
}
}
--
Gitblit v1.9.2