Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-21 4b55cf8d21443e366f83acf20c4333abef8f54ae

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java

@@ -22,7 +22,6 @@

    IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);

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


}