Merge remote-tracking branch 'origin/master'

zss

2023-08-28 f32e75ed3d34f31da74c0199d53139268e9cd560

 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();
}