Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -86,6 +86,9 @@ public class AndonBoardModel implements Serializable {
     @ApiParam(value = "事件原因描述")
     public String ecNameRdd;
 
+    @ApiParam(value = "具体事件原因描述")
+    public String ecDesc;
+
     @ApiParam(value = "小时")
     public String hour;
 

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;

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;
 }