Merge branch 'dev' into pre-production

7 months ago · e7447dcb84
1 changed files with 1 additions and 1 deletions
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportBillLoadingMapper.xml
@ -27,7 +27,7 @@
            dsa.warehouse,
            dsa.warehouse_id,
            dsa.consignee_unit,
-            dpl.waybill_number,
+            '' waybill_number,
            dsa.order_code,
            t.packet_bar_code,
            dsa.train_number,