Merge remote-tracking branch 'origin/master'

Crunchy

2024-07-18 95e69381eeb4a589e9ab7b8e3b967ceb36d13b1d

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java

@@ -54,7 +54,7 @@

    @Override
    public List<Laboratory> obtainItemParameterList() {
        return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName));
        return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName, Laboratory::getId));
    }