Merge remote-tracking branch 'origin/master'

zss

2023-08-22 da30df12fc02f28a4b016c8c35a3b57e5c29fe35

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

@@ -35,9 +35,6 @@

    Integer updateEquipmentPointInformation(Instrument instrument);

    /**
     * 查询所有设备信息
     * @return
     */
    List<Map> selectInstrument();


}