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

songhuangfeng123

2022-08-19 759bbb8ee99665382a689fa90277a9b2279238da

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

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