From e711e9f051bb76430c2d42ab30d4b5a2c80c71f3 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Thu, 1 Jul 2021 16:34:49 +0800
Subject: [PATCH] =?UTF-8?q?Excel=E7=9A=84=E5=AF=BC=E5=87=BA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java | 8 ++++++--
 .../i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java   | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java
index 4b5934f..6385abe 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java
@@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -72,6 +72,10 @@ public class BasImportTemplate extends BaseBean{
     @ApiParam(value = "起始行", example = "0")
     private Integer startRow;
 
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    private String remark;
+
     @Transient
     @ApiParam("模板明细列表")
     private List<BasImportTemplateDetails> templateDetailsList;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java
index 21c1237..a7da14f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java
@@ -122,4 +122,8 @@ public class BasImportTemplateDetails extends BaseBean{
     @Column(name = "IS_EXPORT_TITLE")
     @ApiParam("是否导出表头")
     private Integer isExportTitle;
+
+    @Column(name = "ANNOTATE_COMMENT")
+    @ApiParam("批注")
+    private String annotateComment;
 }
\ No newline at end of file