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/BaseMaterialDto.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/BaseMaterialDto.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/BaseMaterialDto.java
index 86907be..9d72f5b 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/BaseMaterialDto.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/BaseMaterialDto.java
@@ -6,6 +6,12 @@
//物资名称
private String materialName;
+ /**
+ * 是否是耗材（0是， 1否）
+ */
+ private Byte consumable;
+ private String consumableName;
+
public Long getSmId() {
return smId;
}
@@ -21,4 +27,20 @@
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
+
+ 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