Merge pull request #4 from LQYBill/dev

fix: issue in previous merge

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>

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

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>