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

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java

@@ -18,6 +18,18 @@
    @Query()
    private Integer equipmentTypeId;

    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;

    public Integer getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }

    public Integer getEquipmentTypeId() {
        return equipmentTypeId;
    }
@@ -49,4 +61,4 @@
    public void setPositionNum(String positionNum) {
        this.positionNum = positionNum;
    }
}
}