Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-07-27 c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf

 standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java

@@ -24,4 +24,11 @@
    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);

    List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);

    /**
     * 通过项目名查询项目的试验方法
     * @param name
     * @return
     */
    List<Map> selectInstrumentByProname(String name);
}