Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiptVO.java

@@ -61,7 +61,7 @@ public class QCReceiptVO {
     /**
      * 是否已入库，true 是；false 否
      */
-    private boolean isCompleted;
+    private Boolean isCompleted;
     /**
      * 收货时间
      */

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java

@@ -1,16 +1,18 @@
 package com.nflg.wms.common.pojo.vo;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
 
 @Data
+@Accessors(chain = true)
 public class SrmOrderVO {
 
     /**
      * 送货单ID
      */
-    private  long Id;
+    private Long Id;
 
     /**
      * 送货单号
@@ -55,5 +57,5 @@ public class SrmOrderVO {
     /**
      * 是否完成收货
      */
-    private boolean isCompleted;
+    private Boolean isCompleted;
 }