From 8a67af6c26828a0d8ab4e6816aa93a1c917f7269 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Fri, 13 Aug 2021 09:55:58 +0800
Subject: [PATCH] !285 修复角色分配用户页面接收参数与传递参数类型不一致导致的错误 Merge pull request !285 from 稚屿/N/A
---
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
index b7b8f97..50482c5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -106,6 +106,27 @@
public boolean isStatistics() default false;
/**
+ * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
+ */
+ Align align() default Align.AUTO;
+
+ public enum Align
+ {
+ AUTO(0), LEFT(1), CENTER(2), RIGHT(3);
+ private final int value;
+
+ Align(int value)
+ {
+ this.value = value;
+ }
+
+ public int value()
+ {
+ return this.value;
+ }
+ }
+
+ /**
* 字段类型（0：导出导入；1：仅导出；2：仅导入）
*/
Type type() default Type.ALL;
@@ -128,7 +149,7 @@
public enum ColumnType
{
- NUMERIC(0), STRING(1);
+ NUMERIC(0), STRING(1), IMAGE(2);
private final int value;
ColumnType(int value)
--
Gitblit v1.9.2