Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-19 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3

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

@@ -20,9 +20,12 @@
 */
public interface ProductMapper extends BaseMapper<Product> {

    List<Product> selectProductByMaterialId(String materialId);
    //根据物料id查询检验项目
    List<Map> selectProductByMaterialId(int materialId);

    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Page<Objects> page);
    //展示该型号下的检验项目要求
    List<Map<String, Object>> pageProductInformation(Integer specificationsId);

    Map<String, Object> selectOneChildren(Object father);


}