From 723a2ba79610953489c7542a1d257ca7e6a01486 Mon Sep 17 00:00:00 2001
From: Gauthier LO <lo.gauthier.glo@gmail.com>
Date: Tue, 4 Jul 2023 14:15:37 +0200
Subject: [PATCH] fix: issue in previous merge

---
 .../business/mapper/xml/ParcelMapper.xml      | 21 +------------------
 pom.xml                                       |  1 +
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml
index 0f8036f6b..04b698a45 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.business.mapper.ParcelMapper">
     <insert id="insertOrIgnoreJTParcels" parameterType="list">
         INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country,
-                                  third_bill_code, order_no)
+        third_bill_code, order_no)
         VALUES
         <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
             (
@@ -86,25 +86,6 @@
             )
         </foreach>
     </insert>
-    <insert id="insertOrIgnoreCMKParcels" parameterType="list">
-        INSERT IGNORE INTO parcel(id, create_by, create_time, update_by, update_time, bill_code, country,
-        third_bill_code, order_no, product_code)
-        VALUES
-        <foreach collection="parcels" separator="," open="" close="" item="parcel" index="index">
-            (
-            #{parcel.id},
-            'cmk api',
-            NOW(),
-            'cmk api',
-            NOW(),
-            #{parcel.thirdBillCode},
-            #{parcel.country},
-            #{parcel.thirdBillCode},
-            #{parcel.detail.orderNo},
-            #{parcel.detail.productCode}
-            )
-        </foreach>
-    </insert>
     <select id="fetchParcelsToArchive" resultType="org.jeecg.modules.business.entity.Parcel">
         SELECT *
         FROM parcel
diff --git a/pom.xml b/pom.xml
index 2dafd24fd..ef760b81d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,6 +3,7 @@
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
   <version>1.2.0</version>
+>>>>>>> a4a96e4a (fix: issue in previous merge)
   <packaging>pom</packaging>
   <name>WIA APP ${project.version} </name>