From 740da06972e886d5aa8d1332d4beaae2c26a516b Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Wed, 28 Jul 2021 13:51:09 +0800
Subject: [PATCH] !91 【轻量级PR】 [SysUser] 返回给前端数据的时候,隐藏密码和加盐,防止别人猜测加密方式 或者 暴力破击 Merge pull request !91 from dazer007/master
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 fc60331..975eca3 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
@@ -96,6 +96,32 @@
public String targetAttr() default "";
/**
+ * 是否自动统计数据,在最后追加一行统计数据总和
+ */
+ 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;
@@ -118,7 +144,7 @@
public enum ColumnType
{
- NUMERIC(0), STRING(1);
+ NUMERIC(0), STRING(1), IMAGE(2);
private final int value;
ColumnType(int value)
--
Gitblit v1.9.3