Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-23 8267cbdb4dc96787e245a794f7ec6b4cadf7d532

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

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

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


}