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/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;
    }
}