From a19044397c252c3cba5fa65eab0aa85337771366 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 11 Jun 2023 11:31:53 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/system/entity/Dept.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/system/entity/Dept.java b/src/main/java/cc/mrbird/febs/system/entity/Dept.java
index 942c596..d7f324d 100644
--- a/src/main/java/cc/mrbird/febs/system/entity/Dept.java
+++ b/src/main/java/cc/mrbird/febs/system/entity/Dept.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_dept")
-@Excel("部门信息表")
public class Dept implements Serializable {
private static final long serialVersionUID = 5702271568363798328L;
@@ -44,7 +42,7 @@
@TableField("DEPT_NAME")
@NotBlank(message = "{required}")
@Size(max = 10, message = "{noMoreThan}")
- @ExcelField(value = "部门名称")
+ @ExcelProperty(value = "部门名称")
private String deptName;
/**
@@ -57,11 +55,11 @@
* 创建时间
*/
@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