Merge remote-tracking branch 'origin/master'

value

2023-08-30 19c9e29273e8e751847d9dcb06b346dede48d2c8

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

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

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

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

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

    List<Map<String, String>> getInstrument();
}