Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-12-23 5bd5f3bcd6d2cb375feb0756505691b551339716

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/impl/SafeMaterialClassifyInfoServiceImpl.java

@@ -60,7 +60,7 @@
    }

    @Override
    public List<SafeMaterialClassifyInfo> getList(){
    public List<SafeMaterialClassifyInfo> getParentList(){
        List<SafeMaterialClassifyInfo> list = repository.selectList(new LambdaQueryWrapper<SafeMaterialClassifyInfo>()
                .eq(SafeMaterialClassifyInfo::getDelFlag,0)
                .eq(SafeMaterialClassifyInfo::getParentId,0l));