Merge remote-tracking branch 'origin/master'

zss

2023-08-07 78c62a33671bdcfb0f2019c520f807a4c56fc741

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MetricalInformationServiceImpl.java

@@ -40,8 +40,8 @@
    }

    @Override
    public List<Map<String, Object>> getListEquipmentPointInformation() {
        return metricalInformationMapper.getListEquipmentPointInformation();
    public List<Map<String, Object>> getListEquipmentPointInformation(String InstrumentId) {
        return metricalInformationMapper.getListEquipmentPointInformation(InstrumentId);
    }

    @Override