Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-24 e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293

 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();