Merge branch 'test' into ext-dev

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

@@ -166,7 +166,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
 
     @Column(name = "IF_COMPENSATE")
     @ApiParam(value ="是否补偿")
-    private Integer ifCompensate;
+    private Integer ifCompensate = 0;
 
     @Column(name = "COMPENSATE_TIME")
     @ApiParam(value ="补偿时间")

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

@@ -166,6 +166,11 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("员工编号")
     private String employeeNumber;
 
+    @Column(name = "COMPENSATE_SN")
+    @ApiParam("补偿过程条码")
+    private String compensateSn;
+
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;