Merge remote-tracking branch 'origin/master'

zss

2023-08-22 da30df12fc02f28a4b016c8c35a3b57e5c29fe35

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

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

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

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

    //分配-->选择设备
    List<Map<String, Object>> chooseinstum();
}