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 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> excelList; - - @ApiParam("错误信息集合") - private List ImportErrorModels; -}