Merge remote-tracking branch 'origin/master'

Fixiaobai

2023-08-30 464043930df178727b357e2b31b4e5f19e1e17a8

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

@@ -25,4 +25,6 @@

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

    List<Instrument> getInstrument();
}