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

This commit is contained in:
曹鹏飞 2025-08-29 09:41:29 +08:00
commit 93e1885898
2 changed files with 5 additions and 3 deletions

View File

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

View File

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