Merge pull request !55 from 心悦李国楠/dev-心悦
Merge pull request !58 from 4ook/master
Merge pull request !54 from yongdaidai/N/A
Merge pull request !51 from FungLeo/master
解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
Merge pull request !53 from abbfun/N/A
权限修正（角色导出权限）
Merge pull request !49 from HaoRan/master
Merge pull request !48 from soulCoke/master
Merge pull request !47 from FungLeo/master
提高性能
