提交

olive-console/src/main/java/com/zrqx/olive/project/dao/TeamMemberRelationDao.java

@@ -16,7 +16,7 @@ import com.zrqx.olive.project.vo.TeamMemberVo;
 @Mapper
 public interface TeamMemberRelationDao extends BaseMapper<TeamMemberRelation> {
 	@Select("<script>"
-			+ "SELECT t2.id,t2.account,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time "
+			+ "SELECT t2.id,t2.account,t2.real_name,t4.department_name,t1.role_name,DATE_FORMAT(t1.upload_time,'%Y-%m-%d') upload_time "
 			+ "from t_team_member_relation t1 " 
 			+ "INNER JOIN eb_system_admin t2 on t1.account_id=t2.id "   
 			+ "INNER JOIN sys_department t4 on t2.department_id=t4.id where 1=1"

olive-console/src/main/java/com/zrqx/olive/project/vo/TeamMemberListVo.java

@@ -16,6 +16,8 @@ public class TeamMemberListVo {
 	private String  teamId;
 	@ApiModelProperty(value = "后台管理员姓名")
     private String account;
+	@ApiModelProperty(value = "后台管理员中文名")
+    private String realName;
     @ApiModelProperty(value = "后台管理员权限(menus_id)")
     private String roleName;
 	@ApiModelProperty("总工时")