Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

4 天以前 01bdd3d234335a61c849fc53d28eabff29949f33

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrGroupServiceImpl.java

@@ -52,6 +52,9 @@
            }
        }
        List<MatnrGroup> treeData = Utils.toTreeData(matnrs, 0L, MatnrGroup::getParentId, MatnrGroup::getId, MatnrGroup::setChildren);
        if (treeData.isEmpty()) {
            return new ArrayList<>();
        }
        return treeData;
    }
}