Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 730443b70de88d328ffa275f51f69280fda979e4

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

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

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