From ac24a9c6172e0ab1e4238d5dc04e7b0ca8c87a04 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 31 七月 2020 16:57:00 +0800
Subject: [PATCH] 防止如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题

---
 src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
index 39c92a6..fed6f19 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java
@@ -40,6 +40,11 @@
     public String readConverterExp() default "";
 
     /**
+     * 鍒嗛殧绗︼紝璇诲彇瀛楃涓茬粍鍐呭
+     */
+    public String separator() default ",";
+
+    /**
      * 瀵煎嚭绫诲瀷锛�0鏁板瓧 1瀛楃涓诧級
      */
     public ColumnType cellType() default ColumnType.STRING;

--
Gitblit v1.9.3