diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
index 4923f79b..e77056ef 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java
@@ -2,6 +2,7 @@ package com.adc.da.sys.entity;
import com.adc.da.base.entity.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
@@ -14,6 +15,7 @@ import java.util.List;
* 日期: 2018-09-03
* 版权所有:版权归北京卡达克数据技术中心所有。
*/
+@Data
public class UserEO extends BaseEntity implements Serializable {
private static final long serialVersionUID = 3658632939727891047L;
@@ -51,7 +53,8 @@ public class UserEO extends BaseEntity implements Serializable {
private Integer unlockFlag;
private String userInfoId;
private String orgType;
-
+ private String institutionName;
+ private String institutionId;
private String ssoId;
private String token;
/**
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
index 2ffc9c1b..0b4986d5 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml
@@ -28,6 +28,8 @@
+
+
@@ -78,6 +80,7 @@
usid, account, valid_flag, password, uname, ext_info,email,work_num,creation_time,modify_time,oper_user,user_source,disable_flag,unlock_flag,user_type
+ ,INSTITUTION_NAME,INSTITUTION_ID