From 1d0d712b4f2b489e020cbf23eaf20e386eee1561 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 01:46:42 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/system/entity/User.java |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/system/entity/User.java b/src/main/java/cc/mrbird/febs/system/entity/User.java
index 81e0987..4154c3e 100644
--- a/src/main/java/cc/mrbird/febs/system/entity/User.java
+++ b/src/main/java/cc/mrbird/febs/system/entity/User.java
@@ -2,15 +2,14 @@
 
 import cc.mrbird.febs.common.annotation.Desensitization;
 import cc.mrbird.febs.common.annotation.IsMobile;
-import cc.mrbird.febs.common.converter.TimeConverter;
+
 import cc.mrbird.febs.common.entity.DesensitizationType;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.wuwenze.poi.annotation.Excel;
-import com.wuwenze.poi.annotation.ExcelField;
 import lombok.Data;
 
 import javax.validation.constraints.Email;
@@ -24,7 +23,6 @@
  */
 @Data
 @TableName("t_user")
-@Excel("用户信息表")
 public class User implements Serializable {
 
     private static final long serialVersionUID = -4352868070794165001L;
@@ -86,7 +84,7 @@
      */
     @TableField("USERNAME")
     @Size(min = 4, max = 10, message = "{range}")
-    @ExcelField(value = "用户名")
+    @ExcelProperty(value = "用户名")
     private String username;
 
     /**
@@ -107,7 +105,7 @@
     @TableField("EMAIL")
     @Size(max = 50, message = "{noMoreThan}")
     @Email(message = "{email}")
-    @ExcelField(value = "邮箱")
+    @ExcelProperty(value = "邮箱")
     private String email;
 
     /**
@@ -115,7 +113,7 @@
      */
     @TableField("MOBILE")
     @IsMobile(message = "{mobile}")
-    @ExcelField(value = "联系电话")
+    @ExcelProperty(value = "联系电话")
     @Desensitization(type = DesensitizationType.PHONE)
     private String mobile;
 
@@ -124,28 +122,28 @@
      */
     @TableField("STATUS")
     @NotBlank(message = "{required}")
-    @ExcelField(value = "状态", writeConverterExp = "0=锁定,1=有效")
+    @ExcelProperty(value = "状态")
     private String status;
 
     /**
      * 创建时间
      */
     @TableField("CREATE_TIME")
-    @ExcelField(value = "创建时间", writeConverter = TimeConverter.class)
+    @ExcelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 修改时间
      */
     @TableField("MODIFY_TIME")
-    @ExcelField(value = "修改时间", writeConverter = TimeConverter.class)
+    @ExcelProperty(value = "修改时间")
     private Date modifyTime;
 
     /**
      * 最近访问时间
      */
     @TableField("LAST_LOGIN_TIME")
-    @ExcelField(value = "最近访问时间", writeConverter = TimeConverter.class)
+    @ExcelProperty(value = "最近访问时间")
     @JsonFormat(pattern = "yyyy年MM月dd日 HH时mm分ss秒", timezone = "GMT+8")
     private Date lastLoginTime;
 
@@ -154,7 +152,7 @@
      */
     @TableField("SSEX")
     @NotBlank(message = "{required}")
-    @ExcelField(value = "性别", writeConverterExp = "0=男,1=女,2=保密")
+    @ExcelProperty(value = "性别")
     private String sex;
 
     /**
@@ -180,13 +178,13 @@
      */
     @TableField("DESCRIPTION")
     @Size(max = 100, message = "{noMoreThan}")
-    @ExcelField(value = "个人描述")
+    @ExcelProperty(value = "个人描述")
     private String description;
 
     /**
      * 部门名称
      */
-    @ExcelField(value = "部门")
+    @ExcelProperty(value = "部门")
     @TableField(exist = false)
     private String deptName;
 
@@ -201,7 +199,7 @@
     @TableField(exist = false)
     private String roleId;
 
-    @ExcelField(value = "角色")
+    @ExcelProperty(value = "角色")
     @TableField(exist = false)
     private String roleName;
 

--
Gitblit v1.9.1