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/others/entity/Eximport.java |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/others/entity/Eximport.java b/src/main/java/cc/mrbird/febs/others/entity/Eximport.java
index a7fe761..d75f94f 100644
--- a/src/main/java/cc/mrbird/febs/others/entity/Eximport.java
+++ b/src/main/java/cc/mrbird/febs/others/entity/Eximport.java
@@ -1,9 +1,7 @@
 package cc.mrbird.febs.others.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.wuwenze.poi.annotation.Excel;
-import com.wuwenze.poi.annotation.ExcelField;
-import com.wuwenze.poi.validator.EmailValidator;
 import lombok.Data;
 
 import java.util.Date;
@@ -15,28 +13,24 @@
  */
 @Data
 @TableName("t_eximport")
-@Excel("测试导入导出数据")
 public class Eximport {
 
     /**
      * 字段1
      */
-    @ExcelField(value = "字段1", required = true, maxLength = 20,
-            comment = "提示:必填,长度不能超过20个字符")
+    @ExcelProperty(value = "字段1")
     private String field1;
 
     /**
      * 字段2
      */
-    @ExcelField(value = "字段2", required = true, maxLength = 11, regularExp = "[0-9]+",
-            regularExpMessage = "必须是数字", comment = "提示: 必填,只能填写数字,并且长度不能超过11位")
+    @ExcelProperty(value = "字段2")
     private Integer field2;
 
     /**
      * 字段3
      */
-    @ExcelField(value = "字段3", required = true, maxLength = 50,
-            comment = "提示:必填,只能填写邮箱,长度不能超过50个字符", validator = EmailValidator.class)
+    @ExcelProperty(value = "字段3")
     private String field3;
 
     /**

--
Gitblit v1.9.1