Merge remote-tracking branch 'origin/master'

“zhuo”

2023-08-10 cf347859a3a023f48bdb82e7702c0df8858759db

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

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

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

    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);