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/entity/SafeMaterialClassifyInfo.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialClassifyInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialClassifyInfo.java
index 0880f55..d38dd84 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialClassifyInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialClassifyInfo.java
@@ -18,6 +18,12 @@
*/
private String materialClassifyName;
/**
+ * 父级id
+ */
+ private Long parentId;
+
+ private Byte consumable;
+ /**
* 删除标识
*/
@TableField(fill = FieldFill.INSERT) //自动填充的注解
@@ -128,4 +134,20 @@
public void setUpdateUname(String updateUname) {
this.updateUname = updateUname;
}
+
+ public Long getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Long parentId) {
+ this.parentId = parentId;
+ }
+
+ public Byte getConsumable() {
+ return consumable;
+ }
+
+ public void setConsumable(Byte consumable) {
+ this.consumable = consumable;
+ }
}
--
Gitblit v1.9.2