From a4a96e4a8a3e6bcf1f7e3d37c2c061b718a90d22 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      | 30 ++++---------------
 .../business/mapper/xml/ParcelTraceMapper.xml |  9 ------
 pom.xml                                       |  2 +-
 3 files changed, 6 insertions(+), 35 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 268923b01..c745bb1bd 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
@@ -94,23 +94,16 @@
             #{number}
         </foreach>;
     </select>
-<<<<<<< HEAD
-    <insert id="insertParcelsArchive" parameterType="list">
-        INSERT INTO parcel_delete(id, create_by, create_time,
-                                    update_by, update_time, bill_code,
-                                    country, third_bill_code,
-                                    order_no, product_code)
-=======
 
-    <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)
->>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58
+        <insert id="insertParcelsArchive" parameterType="list">
+            INSERT INTO parcel_delete(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},
-<<<<<<< HEAD
             #{parcel.createBy},
             #{parcel.createTime},
             #{parcel.updateBy},
@@ -122,18 +115,5 @@
             #{parcel.productCode}
             )
         </foreach>;
-=======
-            'cmk api',
-            NOW(),
-            'cmk api',
-            NOW(),
-            #{parcel.thirdBillCode},
-            #{parcel.country},
-            #{parcel.thirdBillCode},
-            #{parcel.detail.orderNo},
-            #{parcel.detail.productCode}
-            )
-        </foreach>
->>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58
     </insert>
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelTraceMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelTraceMapper.xml
index 7a4d020f5..0c8e4bd3a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelTraceMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/ParcelTraceMapper.xml
@@ -80,10 +80,6 @@
             )
         </foreach>
     </insert>
-<<<<<<< HEAD
-=======
-
->>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58
     <insert id="insertOrIgnoreCMKTraces" parameterType="list">
         INSERT IGNORE INTO parcel_trace(id, create_by, create_time, update_by, update_time, parcel_id, scan_time,
         description, description_en, trace_location, scan_type)
@@ -104,12 +100,7 @@
             )
         </foreach>
     </insert>
-<<<<<<< HEAD
     <select id="fetchParcelTracesToArchive" resultType="org.jeecg.modules.business.entity.ParcelTrace">
-=======
-
-    <select id="fetchParcelTracesToArchive" resultType="org.jeecg.modules.business.entity.Parcel">
->>>>>>> 9c5c7432b6824185b589760c500b696f46f82c58
         SELECT *
         FROM parcel_trace
         WHERE parcel_id IN
diff --git a/pom.xml b/pom.xml
index 4d4e3a612..85ede3c5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-  <version>0.2.5</version>
+  <version>0.2.6</version>
   <packaging>pom</packaging>
   <name>WIA APP ${project.version} </name>