Merge remote-tracking branch 'origin/master'

Pu Zhibing

昨天 f6f4e7beea525f0c450d618fdc93f112c6813edc

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java

@@ -38,12 +38,12 @@
    }

    @Override
    public List<ZTreeNode> tree() {
        return this.baseMapper.tree();
    public List<ZTreeNode> tree(Integer objectId) {
        return this.baseMapper.tree(objectId);
    }

    @Override
    public List<Map<String, Object>> list(String condition) {
        return this.baseMapper.list(condition);
    public List<Map<String, Object>> list(String condition, Integer objectId) {
        return this.baseMapper.list(condition, objectId);
    }
}