From 980f98bf26ef83faa246a382e86decdfd58fc15b Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 1 Jul 2021 11:17:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E5=85=B7=E4=BD=93=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index a3ab756..f286942 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/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; From e711e9f051bb76430c2d42ab30d4b5a2c80c71f3 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 1 Jul 2021 16:34:49 +0800 Subject: [PATCH 2/2] =?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 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