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/service/impl/EquipmentTypeMngServiceImpl.java

@@ -31,9 +31,9 @@

    @Autowired
    private EquipmentTypeMngRepository equipmentTypeMngRepository;



    
    
	
   @Override
    public ResultVO queryAll(PageQuery<EquipmentTypeMngQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
@@ -78,4 +78,4 @@
        }
        return rsList;
    }
}
}