From 72e7d01b5b249ae1a079d19cdc62ecd2782c325c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sat, 10 Jun 2023 01:24:36 +0800
Subject: [PATCH] ecel

---
 src/main/java/cc/mrbird/febs/system/entity/Role.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/system/entity/Role.java b/src/main/java/cc/mrbird/febs/system/entity/Role.java
index 5bf85df..2f06bfe 100644
--- a/src/main/java/cc/mrbird/febs/system/entity/Role.java
+++ b/src/main/java/cc/mrbird/febs/system/entity/Role.java
@@ -1,12 +1,11 @@
 package cc.mrbird.febs.system.entity;
 
-import cc.mrbird.febs.common.converter.TimeConverter;
+
+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.wuwenze.poi.annotation.Excel;
-import com.wuwenze.poi.annotation.ExcelField;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -19,7 +18,6 @@
  */
 @Data
 @TableName("t_role")
-@Excel("角色信息表")
 public class Role implements Serializable {
 
     private static final long serialVersionUID = -4493960686192269860L;
@@ -33,7 +31,7 @@
      * 角色名称
      */
     @TableField("ROLE_NAME")
-    @ExcelField(value = "角色名称")
+    @ExcelProperty(value = "角色名称")
     @NotBlank(message = "{required}")
     @Size(max = 10, message = "{noMoreThan}")
     private String roleName;
@@ -42,7 +40,7 @@
      * 角色描述
      */
     @TableField("REMARK")
-    @ExcelField(value = "角色描述")
+    @ExcelProperty(value = "角色描述")
     @Size(max = 50, message = "{noMoreThan}")
     private String remark;
 
@@ -50,14 +48,14 @@
      * 创建时间
      */
     @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;
 
     /**

--
Gitblit v1.9.1