Merge remote-tracking branch 'origin/dev' into dev

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

@@ -159,7 +159,7 @@ public class WmsMoveMaster extends BaseBean {
 
     @Transient
     @ApiParam("总行数")
-    private Integer itemQty;
+    private Long itemQty;
 
 //    @Version
 //    @Column(name = "LOCK_VERSION")
@@ -225,10 +225,10 @@ public class WmsMoveMaster extends BaseBean {
         this.modifyDatetime = modifyDatetime;
     }
 
-    public WmsMoveMaster(Integer itemQty , String transTypeCode , Integer itemStatus){
+    public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){
         this.itemQty = itemQty;
         this.transTypeCode = transTypeCode;
-        this.itemStatus = itemStatus;
+        this.orderStatus = orderStatus;
     }
 
     public Double getTransQty() {