Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-20 9f122a41255d18f04a82d8be3b038a95c2c18d95

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