合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

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