From e47f050ff339264cf71e1698c1d7579b6fe230ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= <sliter.yuan@estsh.com>
Date: Tue, 19 May 2020 13:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E7=94=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=92=8C=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/model/mes/ExcelImportModel.java    |  3 ++
 .../i3plus/pojo/model/wms/ExcelImportModel.java    | 41 ----------------------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java
index f355ca3..a4d0580 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/ExcelImportModel.java
@@ -43,4 +43,7 @@ public class ExcelImportModel<T> implements Serializable {
     @ApiParam("导入进度")
     private String importSpeed;
 
+    @ApiParam("Sheet名称")
+    private String sheetName;
+
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java
deleted file mode 100644
index a8eb1fd..0000000
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ExcelImportModel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.estsh.i3plus.pojo.model.wms;
-
-
-import cn.estsh.i3plus.pojo.model.mes.ImportErrorModel;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @Author: siliter.yuan
- * @CreateDate: 2020/4/21 9:19 AM
- * @Description:
- **/
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Api("导入结果model")
-public class ExcelImportModel implements Serializable {
-
-    private static final long serialVersionUID = 1444427447244864339L;
-    @ApiParam("结果")
-    private boolean result;
-
-    @ApiParam("成功行数量")
-    private int successRowNum;
-
-    @ApiParam("工作薄名称")
-    private String sheetName;
-
-    @ApiParam("导入数据集合")
-    private List<ConcurrentHashMap<String, Object>> excelList;
-
-    @ApiParam("错误信息集合")
-    private List<ImportErrorModel> ImportErrorModels;
-}