Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

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

@@ -45,8 +45,8 @@
    }

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

    @Override