From 60e7d28ed05f909bcc1b7403b83725b8a0eb89dd Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Thu, 29 Aug 2024 16:31:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=9F=E8=80=97=E5=87=BA=E5=BA=93=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E6=8D=9F=E8=80=97=E6=96=B9=E5=BC=8F=EF=BC=9A1:?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E9=80=89=E5=85=A5=EF=BC=9B2=EF=BC=9A?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/collect/IoSplitDesOrder.java  | 7 ++++++-
 .../com/glxp/api/res/collect/IoSplitDesOrderResponse.java  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java
index de2b63b1c..59269751d 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoSplitDesOrder.java
@@ -30,13 +30,18 @@ public class IoSplitDesOrder implements Serializable {
     private Integer id;
 
     @TableField(value = "billNo")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String billNo;
 
     @TableField(value = "busType")
     @ApiModelProperty(value = "")
     private String busType;
 
+    @TableField(value = "orderType")
+    @ApiModelProperty(value = "损耗方式：1:库存选入；2：扫码添")
+    private Integer orderType;
+
+
     @TableField(value = "workPlaceCode")
     @ApiModelProperty(value = "")
     private Long workPlaceCode;
diff --git a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java
index 7d566f32b..7a175d82a 100644
--- a/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/IoSplitDesOrderResponse.java
@@ -7,7 +7,7 @@ import java.util.Date;
 @Data
 public class IoSplitDesOrderResponse {
 
-    private Integer id;
+    private Long id;
 
     private String billNo;