Jenkins自动合并

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -19,4 +19,9 @@ public class WmsJobParamModel implements Serializable {
     private List<String> zonesNoList;//存储区编号
     private Integer snType;//条码类型（虚拟，实物）
     private String devOpsEmail;//运维人员邮箱
+    private Integer minuteDiff;//处理周期(分钟)
+
+    public int getMinuteDiffVal() {
+        return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java

@@ -96,6 +96,9 @@ public class WmsActionGroup extends BaseBean {
         return this.endAmId == null ? 0 : this.endAmId.longValue();
     }
 
+    public int getIsCommitRefMoveVal() {
+        return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
+    }
     public int getAutoInitVal() {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }