Merge branch 'dev' into test

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml

@@ -78,8 +78,8 @@
     <select id="getSupplyData" resultType="Map" >
         SELECT
             wo.waybill_no logiBillNo,
-            wb.arrive_site destinationWarehouse,
-            cast (wb.arrive_site_id as char) destinationWarehouseId
+            wb.warehouse_name destinationWarehouse,
+            cast (wb.warehouse_id as char) destinationWarehouseId
         FROM ht_advance_detail d
                  left join ht_waybill_order wo on wo.advance_id = d.advance_id and wo.delete_time = 0
                  left join ht_way_bill wb on wb.id = wo.way_bill_id and wb.delete_time = 0