Merge remote-tracking branch 'origin/master'

zss

2023-07-20 65fd581bef13be2380e481cc341b81c58a061a4a

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

@@ -18,7 +18,7 @@
public interface ProductService extends IService<Product> {

    /*通过物料id获取物料信及下属的项目列表*/
    List<Product> selectProductByMaterialId(int materialId);
    List<Product> selectProductByMaterialId(String materialId);

    Integer addProductInformation(Product product);