Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-24 e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293

 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/StandardMapper.java

@@ -5,6 +5,7 @@
import com.yuanchu.limslaboratory.pojo.Standard;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

/**
@@ -18,4 +19,6 @@
public interface StandardMapper extends BaseMapper<Standard> {

    IPage<Map<String, Object>> listPageStandardsInformation(Page<Object> page, String idOrNameOfStandards);

    List<Map<String, Object>> getSpecificationIdAndName(String materialId);
}