From fe05a76f6fc0894ebbe293211e7dd6f0df8f7089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Tue, 23 Jun 2020 09:19:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=82=E8=A3=85=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E4=B8=8Emodel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java     | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index bc568d7..09296ef 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -140,6 +140,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
 
+    @Column(name = "CUST_LABEL_TEMPLATE")
+    @ApiParam("客户标签模板")
+    private String custLabelTemplate;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java
index b00f907..f4a4de9 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java
@@ -19,7 +19,7 @@ public class ProdPackModel {
     @ApiParam("产品条码")
     private String productSn;
 
-    // 包装主表--包装标号
+    // 包装主表--包装编号
     @ApiParam("一检箱条码")
     private String packageNo;