Merge remote-tracking branch 'origin/master'

zss

2023-08-23 58579a382615c0f9bd03b52ae7227a2ca64f43f3

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java

@@ -120,8 +120,8 @@
    }

    @Override
    public List<Map<String, Object>> getFourLevelInformation(String specificationName) {
        return materialMapper.FourTree(specificationName);
    public List<Map<String, Object>> getFourLevelInformation() {
        return materialMapper.FourTree();
    }

    //添加指标-->选择样品名称