From a9a1200e77be407d07b60a7dadf6a54e24e6367a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 01 Aug 2020 19:09:08 +0800
Subject: [PATCH] 升级vue-cli版本到4.4.4
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
index fa7f6eb..6823f54 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
@@ -15,6 +15,11 @@
public @interface Excel
{
/**
+ * 导出时在excel中排序
+ */
+ public int sort() default Integer.MAX_VALUE;
+
+ /**
* 导出到Excel中的名字.
*/
public String name() default "";
@@ -30,6 +35,11 @@
public String readConverterExp() default "";
/**
+ * 分隔符，读取字符串组内容
+ */
+ public String separator() default ",";
+
+ /**
* 导出类型（0数字 1字符串）
*/
public ColumnType cellType() default ColumnType.STRING;
--
Gitblit v1.9.3