Merge remote-tracking branch 'origin/master'

“zhuo”

2023-08-09 636af7d0ed40549da7182569175e69068e5e937d

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

@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -33,4 +34,11 @@
    Instrument getIdInstrumentInformation(Integer instrumentId);

    Integer updateEquipmentPointInformation(Instrument instrument);

    /**
     * 查询所有设备信息
     * @return
     */
    List<Map> selectInstrument();

}