Merge remote-tracking branch 'origin/master'

Crunchy

2024-06-04 ea7654c0cdb21ec7e8f854df6d0a7367b5e5d6ac

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java

@@ -120,10 +120,10 @@
    }

    @Override
    public List<StandardTree> getStandTreeBySampleType() {
    public List<StandardTree> getStandTreeBySampleType(String laboratory, String sampleType) {
        return standardTreeMapper.selectList(Wrappers.<StandardTree>lambdaQuery()
                .eq(StandardTree::getLaboratory, "通信产品实验室")
                .eq(StandardTree::getSampleType, "光纤")
                .eq(StandardTree::getLaboratory, laboratory)
                .eq(StandardTree::getSampleType, sampleType)
                .select(StandardTree::getModel, StandardTree::getSample));
    }
}