Merge remote-tracking branch 'origin/master'

Pu Zhibing

2 天以前 f6f4e7beea525f0c450d618fdc93f112c6813edc

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java

@@ -22,11 +22,11 @@
    /**
     * 获取ztree的节点列表
     */
    List<ZTreeNode> tree();
    List<ZTreeNode> tree(@Param("objectId") Integer objectId);

    /**
     * 获取所有部门列表
     */
    List<Map<String, Object>> list(@Param("condition") String condition);
    List<Map<String, Object>> list(@Param("condition") String condition, @Param("objectId") Integer objectId);

}