Merge remote-tracking branch 'origin/master'

zss

2024-08-03 f608e00e49461f60ba8df1566fc4b9a998430ace

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