Jenkins自动合并

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java

@@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder {
     @ApiParam(value ="指定工艺路线")
     private String specifyRouting;
 
-    @Column(name="RESYNCHRONIZE")
-    @ApiParam(value ="是否同步")
-    @FieldAnnotation(defaultValue = "true")
-    private Boolean resynchronize;
-
     @Column(name="RECALC_COUNT")
     @ApiParam(value ="是否重新计算数量")
     @FieldAnnotation(defaultValue = "true")

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

@@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "目的库位")
     private String destLocateNo;
 
+    @Column(name = "DEST_MOVE_TYPE")
+    @ApiParam(value = "目的库位")
+    private String destMoveType;
+
     public WmsRoutingRule(){}
 
 }