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

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

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

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

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

    //类型/类别外键
    @Query()
    private Integer equipmentTypeId;

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