diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
index 00c4a954..d0feb50b 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
@@ -5,6 +5,8 @@ package com.jeesite.modules.sys.entity;
 
 import javax.validation.Valid;
 
+import com.jeesite.common.entity.BaseEntity;
+import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.JoinTable.Type;
@@ -27,7 +29,11 @@ import com.jeesite.common.utils.excel.fieldtype.OfficeType;
 		@JoinTable(type=Type.JOIN, entity=Employee.class, alias="e",
 			on="e.emp_code=a.ref_code AND a.user_type=#{USER_TYPE_EMPLOYEE}",
 			attrName="employee", columns={
-					@Column(includeEntity=Employee.class)
+				@Column(includeEntity=BaseEntity.class),
+				@Column(includeEntity=DataEntity.class),
+				@Column(name="emp_code", 	attrName="empCode", 			label="员工编码", isPK=true),
+				@Column(name="emp_name", 	attrName="empName", 			label="员工姓名", queryType=QueryType.LIKE),
+				@Column(name="emp_name_en", attrName="empNameEn", 			label="英文名", queryType=QueryType.LIKE),
 			}),
 		@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, alias="o", 
 			on="o.office_code=e.office_code", attrName="employee.office",
diff --git a/parent/pom.xml b/parent/pom.xml
index e56f3a74..beb447c2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -48,7 +48,7 @@
 		<mybatis-spring.version>1.3.2</mybatis-spring.version>
 		<jsqlparser.version>1.1</jsqlparser.version>
 		<druid.version>1.1.18</druid.version>
-		<shiro.version>1.4.0</shiro.version>
+		<shiro.version>1.4.2</shiro.version>
 		<j2cache.version>2.7.0-release</j2cache.version>
 		<beetl.version>3.0-SNAPSHOT</beetl.version>
 		<swagger.version>1.5.20</swagger.version>