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/SafeMaterialDto.java

@@ -16,9 +16,11 @@
    /**
     * 物资类型id
     */
    private Long materialClassifyId;
    private Long bigClassifyId;

    private String materialClassifyName;
    private String bigClassifyName;

    private Long smallClassifyId;
    /**
     * 部门id
     */
@@ -40,7 +42,13 @@
    /**
     * 有效库存数量
     */
    private Integer validStockCount;
    private Integer stockCount;

    /**
     * 总库存
     * @return
     */
    private Integer totalCount;

    public Long getId() {
        return id;
@@ -58,21 +66,7 @@
        this.serialNum = serialNum;
    }

    public Long getMaterialClassifyId() {
        return materialClassifyId;
    }

    public void setMaterialClassifyId(Long materialClassifyId) {
        this.materialClassifyId = materialClassifyId;
    }

    public String getMaterialClassifyName() {
        return materialClassifyName;
    }

    public void setMaterialClassifyName(String materialClassifyName) {
        this.materialClassifyName = materialClassifyName;
    }

    public Long getDepId() {
        return depId;
@@ -114,13 +108,43 @@
        this.consumableName = consumableName;
    }

    public Integer getValidStockCount() {
        return validStockCount;
    public Integer getStockCount() {
        return stockCount;
    }

    public void setValidStockCount(Integer validStockCount) {
        this.validStockCount = validStockCount;
    public void setStockCount(Integer stockCount) {
        this.stockCount = stockCount;
    }

    public Integer getTotalCount() {
        return totalCount;
    }

    public void setTotalCount(Integer totalCount) {
        this.totalCount = totalCount;
    }

    public Long getBigClassifyId() {
        return bigClassifyId;
    }

    public void setBigClassifyId(Long bigClassifyId) {
        this.bigClassifyId = bigClassifyId;
    }

    public String getBigClassifyName() {
        return bigClassifyName;
    }

    public void setBigClassifyName(String bigClassifyName) {
        this.bigClassifyName = bigClassifyName;
    }

    public Long getSmallClassifyId() {
        return smallClassifyId;
    }

    public void setSmallClassifyId(Long smallClassifyId) {
        this.smallClassifyId = smallClassifyId;
    }
}