Merge remote-tracking branch 'origin/master'

zss

2023-08-28 f32e75ed3d34f31da74c0199d53139268e9cd560

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

@@ -35,10 +35,6 @@

    Integer updateEquipmentPointInformation(Instrument instrument);

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


}