Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zf

2024-03-25 cd02923a7ce1ffa004b3abbb7af67ab6173dd99d

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/SafeMaterialClassifyInfo.java

@@ -21,6 +21,8 @@
     * 父级id
     */
    private Long parentId;

    private Byte consumable;
    /**
     * 删除标识
     */
@@ -140,4 +142,12 @@
    public void setParentId(Long parentId) {
        this.parentId = parentId;
    }

    public Byte getConsumable() {
        return consumable;
    }

    public void setConsumable(Byte consumable) {
        this.consumable = consumable;
    }
}