Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-08-28 c5138faa1c4771bfbc19de5b257e7c129c081cb8

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

@@ -81,9 +81,5 @@
        return 0;
    }

    //查询所有设备信息
    @Override
    public List<Map> selectInstrument() {
        return instrumentMapper.selectInstrument();
    }

}