Merge remote-tracking branch 'origin/master'

jiangping

2024-01-05 cb6874174975a370cb60f1557704c9d49a05f9e6

 server/dmvisit_service/src/main/java/com/doumee/service/common/tree/CompanyTree.java

@@ -46,7 +46,7 @@
                    rootNodeList.add(treeNode);
                }
            }else{
                if (Objects.isNull(treeNode.getErpId())) {
                if (Objects.isNull(treeNode.getErpParentId())) {
                    // 是，添加
                    rootNodeList.add(treeNode);
                }