Jenkins自动合并

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

@@ -208,7 +208,11 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("优先级")
-    private String priority;
+    private Integer priority;
+
+    @Transient
+    @ApiParam("优先级描述")
+    private String priorityStr;
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -272,8 +276,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.destLocateNo = destLocateNo;
     }
 
-    public WmsDocMovementDetails (String partNo) {
+    public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) {
         this.partNo = partNo;
+        this.priority = priority;
+        this.orderNo = orderNo;
     }
 
     public WmsDocMovementDetails (String partNo,String orderNo) {