Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-23 924d018e6e6f15effbd272cead5dff67cd3b93a5

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

@@ -23,5 +23,6 @@
    IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);



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