Merge branch 'songyuanshuo' into 'master'

1.修改/system/dept/{deptId}sql语句，多查一个dept_type字段

See merge request !10

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,
-			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name, d.address, d.postcode
+			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name, d.address, d.postcode,d.dept_type
 		from sys_dept d
 		where d.dept_id = #{deptId}
 	</select>