Merge branch 'master_chujiang_0819' into master_plan

@@ -176,6 +176,7 @@
             o.id as order_id,
             o.order_no,
             c.name AS customer_name,
+            ol.brand,
             ol.thickness,
             ol.thickness_tol_pos,
             ol.thickness_tol_neg,
@@ -185,6 +186,7 @@
             ol.length,
             ol.length_tol_pos,
             ol.length_tol_neg,
+            ol.status,
             ol.quantity,
             ol.delivery_date as shipments_date
         from tbl_purchase_order_line ol