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/SafeMaterialClassifyDto.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialClassifyDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialClassifyDto.java
index 7195a44..ac53085 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialClassifyDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/SafeMaterialClassifyDto.java
@@ -8,6 +8,13 @@
private Long parentId;
+ /**
+ * 是否是耗材（0是，1否）
+ */
+ private Byte consumable;
+
+ private String consumableName;
+
private List<SafeMaterialClassifyDto> childList;
public Long getParentId() {
@@ -41,4 +48,20 @@
public void setChildList(List<SafeMaterialClassifyDto> childList) {
this.childList = childList;
}
+
+ public Byte getConsumable() {
+ return consumable;
+ }
+
+ public void setConsumable(Byte consumable) {
+ this.consumable = consumable;
+ }
+
+ public String getConsumableName() {
+ return consumableName;
+ }
+
+ public void setConsumableName(String consumableName) {
+ this.consumableName = consumableName;
+ }
}
--
Gitblit v1.9.2