Merge remote-tracking branch 'origin/master'

zss

2023-08-07 78c62a33671bdcfb0f2019c520f807a4c56fc741

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

@@ -18,7 +18,6 @@
 * @author 江苏鵷雏网络科技有限公司
 * @since 2023-07-20
 */
@Mapper
public interface InstrumentMapper extends BaseMapper<Instrument> {

    IPage<Map<String, Object>> getListInstrumentInformation(Integer conditions,Boolean whetherWhether, String numberOrNameOrSpecifications, Integer classifyId, Page<Objects> page);