diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/SsoTenant.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/SsoTenant.java index f0b17bda..4ab9c65c 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/SsoTenant.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/SsoTenant.java @@ -1,6 +1,7 @@ package cn.com.mfish.common.oauth.api.entity; import cn.com.mfish.common.core.entity.BaseEntity; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -71,6 +72,7 @@ public class SsoTenant extends BaseEntity { @ExcelProperty("用户ID,关联用户为管理员") @ApiModelProperty(value = "用户ID,关联用户为管理员") private String userId; + @ExcelIgnore @TableField(exist = false) @ApiModelProperty(value = "角色Id") private List roleIds; diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/vo/TenantVo.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/vo/TenantVo.java index dc248faa..f23e135f 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/vo/TenantVo.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/vo/TenantVo.java @@ -1,6 +1,7 @@ package cn.com.mfish.common.oauth.api.vo; import cn.com.mfish.common.oauth.api.entity.SsoTenant; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,12 +16,16 @@ import lombok.EqualsAndHashCode; @Data @ApiModel("租户对象") public class TenantVo extends SsoTenant { + @ExcelProperty("用户名") @ApiModelProperty("用户名") private String account; + @ExcelProperty("昵称") @ApiModelProperty("昵称") private String nickname; + @ExcelProperty("手机号") @ApiModelProperty("手机号") private String phone; + @ExcelProperty("是否管理员") @ApiModelProperty("是否管理员 1是 0否") private Integer master; }