Merge remote-tracking branch 'origin/master'

value

2023-08-31 c0bbd3356de42175a4bf956d37e85bf74c169d4b

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.ClassAndInsTree;
import com.yuanchu.limslaboratory.pojo.Instrument;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -26,5 +27,5 @@
    //分配-->选择设备
    List<Map<String, Object>> chooseinstum();

    List<Map<String, String>> getInstrument();
    List<ClassAndInsTree> getInstrument();
}