Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderItemsMapper.xml

@@ -67,13 +67,18 @@
     <select id="orderItemsList" resultMap="orderItemsResultMap">
         SELECT
         DISTINCT
-	    item.*
+	    item.*,
+        bg.code AS code,
+        bg.cname AS cname,
+        bg.Typeno AS typeno
         FROM
 	        business_order_items item
 	    LEFT JOIN business_order od
-	    ON item.pid - od.id
+	    ON item.pid = od.id
+        LEFT JOIN basic_goods_desc bg ON item.item_id = bg.id
         WHERE
 	        item.is_deleted = 0
+	        and od.is_deleted = 0
             and item.tenant_id = #{tenantId}
         <if test="corpId!=null">
             and od.corp_id = #{corpId}