Merge branch 'master_after20' into master_cj_zq

@@ -11,6 +11,7 @@
         <result column="workshop_name" property="workshopName"/>
         <result column="shipments_date" property="shipmentsDate"/>
         <result column="dept_id" property="deptId"/>
+        <result column="region" property="region"/>
         <result column="delivery_type" property="deliveryType"/>
         <result column="destination" property="destination"/>
         <result column="status" property="status"/>
@@ -30,6 +31,7 @@
             w.name AS workshop_name,
             tb.shipments_date,
             tb.dept_id,
+            tb.region,
             tb.delivery_type,
             tb.destination,
             tb.status,
@@ -81,6 +83,7 @@
         workshop_id,
         shipments_date,
         dept_id,
+        region,
         delivery_type,
         destination,
         payment_type,
@@ -96,6 +99,7 @@
             #{item.workshopId},
             #{item.shipmentsDate},
             #{item.deptId},
+            #{item.region},
             #{item.deliveryType},
             #{item.destination},
             #{item.paymentType},