Merge remote-tracking branch 'origin/dev' into dev

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

@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select
-		u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+		u.user_id, u.dept_id, u.nick_name, u.nick_name_en, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
 		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader_id,
 		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code
 		from