From 5bd5f3bcd6d2cb375feb0756505691b551339716 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:55:23 +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/req/SafeMaterialClassifyAddReq.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/SafeMaterialClassifyAddReq.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/SafeMaterialClassifyAddReq.java
index d5b83af..3a6f87b 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/SafeMaterialClassifyAddReq.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/SafeMaterialClassifyAddReq.java
@@ -14,6 +14,11 @@
      */
     private Long ParentId;
 
+    /**
+     * 是否是耗材(0是,1否)
+     */
+    private Byte consumable;
+
     public String getMaterialClassifyName() {
         return materialClassifyName;
     }
@@ -29,4 +34,12 @@
     public void setParentId(Long parentId) {
         ParentId = parentId;
     }
+
+    public Byte getConsumable() {
+        return consumable;
+    }
+
+    public void setConsumable(Byte consumable) {
+        this.consumable = consumable;
+    }
 }

--
Gitblit v1.9.2