Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

# Conflicts:
#	klp-admin/src/main/resources/application-prod.yml

klp-wms/src/main/resources/mapper/klp/WmsReceivableMapper.xml

@@ -36,9 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 r.create_by,
                 r.update_time,
                 r.update_by,
-                c.name as customerName
+                c.company_name as customerName,
+                c.customer_code as customerCode,
+                o.order_code as orderCode,
+                o.contract_name as orderName
         from wms_receivable r
-        left join wms_customer c on r.customer_id = c.customer_id and c.del_flag = 0
+        left join crm_customer c on r.customer_id = c.customer_id and c.del_flag = 0
+        left join crm_order o on r.order_id = o.order_id and o.del_flag = 0
         ${ew.customSqlSegment}
     </select>