Jenkins自动合并

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

@@ -111,9 +111,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "客户单号")
     private String custOrderNo;
 
-    @Column(name = "remark")
-    @ApiParam(value = "备注:一步法/两步法")
-    private String remark;
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;
@@ -164,6 +161,15 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "计划时间")
     private String assignPlanTime;
 
+    @Column(name = "TAG")
+    @ApiParam(value = "标签")
+    private String tag;
+
+    @Column(name = "IS_SINGLE_STEP")
+    @ApiParam(value = "一步法/两步法")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description")
+    private Integer isSingleStep;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;
@@ -184,10 +190,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     public String title;
 
-    @Column(name = "TAG")
-    @ApiParam(value = "标签")
-    private String tag;
-
     @Transient
     @ApiParam("物料编号组")
     public String[] partNos;