From b285f2a5d6b1204aa178d5771b2488b4d0884196 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 29 Apr 2026 18:11:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A0=86=E6=89=93=E5=8C=85=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/controller/admin/manage/pack/vo/PackRespVO.java    | 2 ++
 .../src/main/resources/mapper/order/OrderMapper.xml             | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java
index 630d2f708..eed6b39cf 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/pack/vo/PackRespVO.java
@@ -23,6 +23,8 @@ public class PackRespVO {
     @Schema(description = "包裹ID", example = "7788")
     private Long packId;
 
+    @Schema(description = "订单类型", example = "1")
+    private Integer orderType;
 
     @Schema(description = "自定义单号",example = "ABCD")
     private String customOrderNo;
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
index 1d55662b6..51ac7b7fd 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
@@ -503,6 +503,7 @@
         <result property="totalPieceCount" column="totalPieceCount"/>
         <result property="packPieceCount" column="packPieceCount"/>
         <result property="plateNum" column="plateNum"/>
+        <result property="orderType" column="orderType"/>
 
     </resultMap>
 
@@ -542,6 +543,7 @@
 
         select
         id,
+        order_type as orderType,
         parent_id as parentId,
         custom_order_no as customOrderNo,
         dealer as dealer,