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

@@ -11,11 +11,25 @@
    private String positionNum;

    //具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
    @Query()
    private Integer infoType;

    //类型/类别外键
    @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;
    }