Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-08 83488c1cbce53028c9602d2fc96005528d11fb4c

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/service/InstrumentService.java

@@ -40,4 +40,5 @@
     * @return
     */
    List<Map> selectInstrument();

}