Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 eb34edfc7cf46e5cb5e3969d04315e6129dcbbd2

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