Merge remote-tracking branch 'origin/master'

zss

2023-08-23 58579a382615c0f9bd03b52ae7227a2ca64f43f3

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

@@ -16,6 +16,7 @@
 */
public interface MaterialMapper extends BaseMapper<Material> {


    //查询物料信息
    List<Map> selectMaterialLimit(int num1,int num2, int type);

@@ -23,5 +24,10 @@
    Map selectMaterialById(String materialId);

    // 四级树
    List<Map<String, Object>> FourTree(String specificationsName);
    List<Map<String, Object>> FourTree();





}