Jenkins自动合并

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java

@@ -112,7 +112,15 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java

@@ -112,6 +112,14 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;