diff --git a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml index 8bdcdb222942cd4727e7fc91ae0d7cee624f6c23..2ad2ca4eef701afbcefa2753c56b22aa329f8fcf 100644 --- a/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml +++ b/src/main/java/neatlogic/framework/dao/mapper/UserMapper.xml @@ -1478,6 +1478,7 @@ along with this program. If not, see .--> `pinyin`, `is_active`, `is_delete`, + `token`, `source`, `fcu`, `fcd`, @@ -1494,6 +1495,7 @@ along with this program. If not, see .--> #{pinyin}, #{isActive}, 0, + #{token}, #{source}, #{fcu}, NOW(3), @@ -1508,6 +1510,7 @@ along with this program. If not, see .--> `pinyin` = #{pinyin}, `is_active` = #{isActive}, `is_delete` = 0, + `token` = IFNULL(`token`, #{token}), `source` = #{source}, `lcu` = #{lcu}, `lcd` = #{lcd} diff --git a/src/main/java/neatlogic/framework/dto/UserVo.java b/src/main/java/neatlogic/framework/dto/UserVo.java index d7c59f04691a4d7bc3a74eeca5ef5af629dc0ecd..8974e0a6cb34871492bd41caed5f1c8376a67972 100644 --- a/src/main/java/neatlogic/framework/dto/UserVo.java +++ b/src/main/java/neatlogic/framework/dto/UserVo.java @@ -76,6 +76,9 @@ public class UserVo extends BaseEditorVo implements Serializable { @EntityField(name = "是否已删除", type = ApiParamType.ENUM) private Integer isDelete; + @EntityField(name = "令牌", type = ApiParamType.STRING) + private String token; + @EntityField(name = "用户所在组的头衔", type = ApiParamType.ENUM) private String title; @@ -411,6 +414,14 @@ public class UserVo extends BaseEditorVo implements Serializable { this.isDelete = isDelete; } + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + public String getTitle() { return title; }