Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 b0b8ca4b383c5c3a2373200ca1872c20ee9ff999

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

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


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

    List<Instrument> getInstrument();
}