From 0469fac6156bdf1bceabdd792c49d41ca6aa2b87 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sat, 14 Sep 2024 15:49:34 +0800
Subject: [PATCH] =?UTF-8?q?9/14=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/entity/collect/IoCollectOrderOrigin.java  | 6 +++++-
 .../com/glxp/api/res/collect/IoCollectOrderResponse.java   | 7 ++++++-
 src/main/resources/schemas/schema_v2.4.sql                 | 5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java
index 21f2b1ba6..9466a089f 100644
--- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java
@@ -322,5 +322,9 @@ public class IoCollectOrderOrigin implements Serializable {
     @ApiModelProperty(value="异常信息")
     private String errorMsg;
 
+    @TableField(value = "shipper")
+    @ApiModelProperty(value="发货方")
+    private String shipper;
 
-}
\ No newline at end of file
+
+}
diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
index 767dd49bb..2a2636178 100644
--- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java
@@ -89,6 +89,7 @@ public class IoCollectOrderResponse {
     private String tagMsg;
 
 
+    // 业务类型
     private String busTypeName;
     private String fromTypeName;
     private String fromCorpName;
@@ -170,9 +171,13 @@ public class IoCollectOrderResponse {
     private String errorMsg;
 
     /**
-     * 第三地业务类型名称
+     * 第三方单据类型
      */
     private String actionName;
+    /**
+     * 发货方
+     */
+    private String shipper;
 
     public String getFromName() {
 
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 442b465b5..9612c1ad2 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4354,6 +4354,7 @@ CALL Pro_Temp_ColumnWork('thr_products', 'prepnUnit',
                          1);
 
 
+
 CALL Pro_Temp_ColumnWork('io_collect_order', 'errorMsg',
                          'varchar(1024) NULL COMMENT ''异常信息''',
                          1);
@@ -4382,3 +4383,7 @@ CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'tempSplitCount',
                          'int NULL DEFAULT NULL COMMENT ''临时拆零存量''',
                          1);
 
+
+CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'shipper',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''',
+                         1);