Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 1dfb91db022f6cfa4bcb9d953ca9aa8a503e1ca5

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectDeptController.java

@@ -63,7 +63,7 @@
                BeanUtils.copyProperties(projectDept,projectDeptListNoLimitVO1);
                projectDeptListNoLimitVOS1.add(projectDeptListNoLimitVO1);
            }
            projectDeptListNoLimitVO.setChildren(projectDeptListNoLimitVOS1);
            projectDeptListNoLimitVO.setChildrenList(projectDeptListNoLimitVOS1);
            projectDeptListNoLimitVOS.add(projectDeptListNoLimitVO);
        }
        return R.ok(projectDeptListNoLimitVOS);