From b96e001335d17dfd28df75e0f78cd77cfea71deb Mon Sep 17 00:00:00 2001
From: qiufeng <qiufeng9862@qq.com>
Date: Wed, 3 Apr 2024 14:15:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=9F=E6=88=B7=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/com/mfish/common/oauth/api/entity/SsoTenant.java | 2 ++
 .../main/java/cn/com/mfish/common/oauth/api/vo/TenantVo.java | 5 +++++
 2 files changed, 7 insertions(+)

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<String> {
     @ExcelProperty("用户ID，关联用户为管理员")
     @ApiModelProperty(value = "用户ID，关联用户为管理员")
 	private String userId;
+    @ExcelIgnore
     @TableField(exist = false)
     @ApiModelProperty(value = "角色Id")
     private List<String> 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;
 }