Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f

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

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

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

    //选择样品名称
    List<String> selectmater();