mirror of
https://github.com/mfish-qf/mfish-nocode.git
synced 2026-09-24 15:45:53 +08:00
fix: 租户导出问题
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user